From 097587637202b90650c9ebf4e6ee53a1ac545e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 2 Feb 2014 20:47:01 +0100 Subject: [PATCH] macosx: fix recursive inclusion of the compatibility header --- modules/gui/macosx/ControlsBar.h | 3 +-- modules/gui/macosx/ControlsBar.m | 3 ++- modules/gui/macosx/MainWindow.h | 3 +-- modules/gui/macosx/PXSourceList.h | 1 - modules/gui/macosx/PXSourceList.m | 1 + modules/gui/macosx/VLCUIWidgets.h | 3 +-- modules/gui/macosx/VLCUIWidgets.m | 3 ++- modules/gui/macosx/VLCVoutWindowController.h | 3 +-- modules/gui/macosx/VLCVoutWindowController.m | 3 ++- modules/gui/macosx/VideoView.m | 3 ++- modules/gui/macosx/Windows.h | 3 +-- modules/gui/macosx/Windows.m | 3 ++- modules/gui/macosx/intf.h | 3 +-- modules/gui/macosx/misc.h | 3 +-- modules/gui/macosx/misc.m | 3 ++- modules/gui/macosx/playlist.m | 4 +++- 16 files changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/gui/macosx/ControlsBar.h b/modules/gui/macosx/ControlsBar.h index cf938bc90bd07..c2e17d0a9f317 100644 --- a/modules/gui/macosx/ControlsBar.h +++ b/modules/gui/macosx/ControlsBar.h @@ -1,7 +1,7 @@ /***************************************************************************** * ControlsBar.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -23,7 +23,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" #import "misc.h" @class VLCFSPanel; diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m index d595589708b3b..6afffcc91a0d5 100644 --- a/modules/gui/macosx/ControlsBar.m +++ b/modules/gui/macosx/ControlsBar.m @@ -1,7 +1,7 @@ /***************************************************************************** * ControlsBar.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012-2013 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -27,6 +27,7 @@ #import "CoreInteraction.h" #import "MainMenu.h" #import "fspanel.h" +#import "CompatibilityFixes.h" /***************************************************************************** * VLCControlsBarCommon diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h index d6d3bd0029ef9..04fd92c017040 100644 --- a/modules/gui/macosx/MainWindow.h +++ b/modules/gui/macosx/MainWindow.h @@ -1,7 +1,7 @@ /***************************************************************************** * MainWindow.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2013 VLC authors and VideoLAN + * Copyright (C) 2002-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -26,7 +26,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" #import "PXSourceList.h" #import "PXSourceListDataSource.h" diff --git a/modules/gui/macosx/PXSourceList.h b/modules/gui/macosx/PXSourceList.h index d892dfaf123ac..e01899d0b2948 100644 --- a/modules/gui/macosx/PXSourceList.h +++ b/modules/gui/macosx/PXSourceList.h @@ -7,7 +7,6 @@ // #import -#import "CompatibilityFixes.h" #import "PXSourceListDelegate.h" #import "PXSourceListDataSource.h" diff --git a/modules/gui/macosx/PXSourceList.m b/modules/gui/macosx/PXSourceList.m index cac5c0458dafb..2c0500ca3e0dd 100644 --- a/modules/gui/macosx/PXSourceList.m +++ b/modules/gui/macosx/PXSourceList.m @@ -8,6 +8,7 @@ // GC-enabled code revised by Stefan Vogt http://byteproject.net // +#import "CompatibilityFixes.h" #import "PXSourceList.h" #import "SideBarItem.h" diff --git a/modules/gui/macosx/VLCUIWidgets.h b/modules/gui/macosx/VLCUIWidgets.h index 26b41e46987ef..548965dc46fba 100644 --- a/modules/gui/macosx/VLCUIWidgets.h +++ b/modules/gui/macosx/VLCUIWidgets.h @@ -1,7 +1,7 @@ /***************************************************************************** * VLCUIWidgets.h: Widgets for VLC's extensions dialogs for Mac OS X ***************************************************************************** - * Copyright (C) 2009-2012 the VideoLAN team and authors + * Copyright (C) 2009-2014 the VideoLAN team and authors * $Id$ * * Authors: Pierre d'Herbemont , @@ -23,7 +23,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" #import @class VLCDialogGridView; diff --git a/modules/gui/macosx/VLCUIWidgets.m b/modules/gui/macosx/VLCUIWidgets.m index 4f53b05c2a278..7e08899d75b87 100644 --- a/modules/gui/macosx/VLCUIWidgets.m +++ b/modules/gui/macosx/VLCUIWidgets.m @@ -1,7 +1,7 @@ /***************************************************************************** * VLCUIWidgets.m: Widgets for VLC's extensions dialogs for Mac OS X ***************************************************************************** - * Copyright (C) 2009-2012 the VideoLAN team and authors + * Copyright (C) 2009-2014 the VideoLAN team and authors * $Id$ * * Authors: Pierre d'Herbemont , @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#import "CompatibilityFixes.h" #import "VLCUIWidgets.h" #import diff --git a/modules/gui/macosx/VLCVoutWindowController.h b/modules/gui/macosx/VLCVoutWindowController.h index c2caab91054d3..9787773556c3e 100644 --- a/modules/gui/macosx/VLCVoutWindowController.h +++ b/modules/gui/macosx/VLCVoutWindowController.h @@ -1,7 +1,7 @@ /***************************************************************************** * VLCVoutWindowController.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012-2013 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -23,7 +23,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" #import diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m index 76af91b2514dc..a632edfdc7e50 100644 --- a/modules/gui/macosx/VLCVoutWindowController.m +++ b/modules/gui/macosx/VLCVoutWindowController.m @@ -1,7 +1,7 @@ /***************************************************************************** * VLCVoutWindowController.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012-2013 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#import "CompatibilityFixes.h" #import "VLCVoutWindowController.h" #import "intf.h" #import "MainWindow.h" diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m index 6e2ebbee65878..91f48a8dcd437 100644 --- a/modules/gui/macosx/VideoView.m +++ b/modules/gui/macosx/VideoView.m @@ -1,7 +1,7 @@ /***************************************************************************** * VideoView.m: MacOS X video output module ***************************************************************************** - * Copyright (C) 2002-2013 VLC authors and VideoLAN + * Copyright (C) 2002-2014 VLC authors and VideoLAN * $Id$ * * Authors: Derk-Jan Hartman @@ -32,6 +32,7 @@ #import /* free() */ #import +#import "CompatibilityFixes.h" #import "intf.h" #import "VideoView.h" #import "CoreInteraction.h" diff --git a/modules/gui/macosx/Windows.h b/modules/gui/macosx/Windows.h index 7916fb50001ba..db652804b7843 100644 --- a/modules/gui/macosx/Windows.h +++ b/modules/gui/macosx/Windows.h @@ -1,7 +1,7 @@ /***************************************************************************** * Windows.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012-2013 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -23,7 +23,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" /***************************************************************************** * VLCWindow diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m index d50835e307963..13182ad9b194c 100644 --- a/modules/gui/macosx/Windows.m +++ b/modules/gui/macosx/Windows.m @@ -1,7 +1,7 @@ /***************************************************************************** * Windows.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2012-2013 VLC authors and VideoLAN + * Copyright (C) 2012-2014 VLC authors and VideoLAN * $Id$ * * Authors: Felix Paul Kühne @@ -27,6 +27,7 @@ #import "CoreInteraction.h" #import "ControlsBar.h" #import "VideoView.h" +#import "CompatibilityFixes.h" /***************************************************************************** * VLCWindow diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index f75de5a2cd148..3fae0e97fde87 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,7 +1,7 @@ /***************************************************************************** * intf.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2013 VLC authors and VideoLAN + * Copyright (C) 2002-2014 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen @@ -38,7 +38,6 @@ #import #import -#import "CompatibilityFixes.h" #import "SPMediaKeyTap.h" /* for the media key support */ #import "misc.h" #import "MainWindow.h" diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h index dd2b440e9b041..b759483d353cd 100644 --- a/modules/gui/macosx/misc.h +++ b/modules/gui/macosx/misc.h @@ -1,7 +1,7 @@ /***************************************************************************** * misc.h: code not specific to vlc ***************************************************************************** - * Copyright (C) 2003-2013 VLC authors and VideoLAN + * Copyright (C) 2003-2014 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen @@ -23,7 +23,6 @@ *****************************************************************************/ #import -#import "CompatibilityFixes.h" /***************************************************************************** * NSSound (VLCAdditions) diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index b9eb7d90b1188..9be3e73857901 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -1,7 +1,7 @@ /***************************************************************************** * misc.m: code not specific to vlc ***************************************************************************** - * Copyright (C) 2003-2013 VLC authors and VideoLAN + * Copyright (C) 2003-2014 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#import "CompatibilityFixes.h" #import "misc.h" #import "intf.h" /* VLCApplication */ #import "MainWindow.h" diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index d2b636c84e17b..f2c80523463f1 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,7 +1,7 @@ /***************************************************************************** * playlist.m: MacOS X interface module ***************************************************************************** -* Copyright (C) 2002-2013 VLC authors and VideoLAN +* Copyright (C) 2002-2014 VLC authors and VideoLAN * $Id$ * * Authors: Jon Lech Johansen @@ -39,6 +39,8 @@ #include #include +#import "CompatibilityFixes.h" + #import "intf.h" #import "wizard.h" #import "bookmarks.h"