Commit 09758763 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fix recursive inclusion of the compatibility header

parent eecfe431
/***************************************************************************** /*****************************************************************************
* ControlsBar.h: MacOS X interface module * ControlsBar.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "misc.h" #import "misc.h"
@class VLCFSPanel; @class VLCFSPanel;
......
/***************************************************************************** /*****************************************************************************
* ControlsBar.m: MacOS X interface module * ControlsBar.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#import "CoreInteraction.h" #import "CoreInteraction.h"
#import "MainMenu.h" #import "MainMenu.h"
#import "fspanel.h" #import "fspanel.h"
#import "CompatibilityFixes.h"
/***************************************************************************** /*****************************************************************************
* VLCControlsBarCommon * VLCControlsBarCommon
......
/***************************************************************************** /*****************************************************************************
* MainWindow.h: MacOS X interface module * MainWindow.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN * Copyright (C) 2002-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "PXSourceList.h" #import "PXSourceList.h"
#import "PXSourceListDataSource.h" #import "PXSourceListDataSource.h"
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "PXSourceListDelegate.h" #import "PXSourceListDelegate.h"
#import "PXSourceListDataSource.h" #import "PXSourceListDataSource.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
// GC-enabled code revised by Stefan Vogt http://byteproject.net // GC-enabled code revised by Stefan Vogt http://byteproject.net
// //
#import "CompatibilityFixes.h"
#import "PXSourceList.h" #import "PXSourceList.h"
#import "SideBarItem.h" #import "SideBarItem.h"
......
/***************************************************************************** /*****************************************************************************
* VLCUIWidgets.h: Widgets for VLC's extensions dialogs for Mac OS X * 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$ * $Id$
* *
* Authors: Pierre d'Herbemont <pdherbemont # videolan dot>, * Authors: Pierre d'Herbemont <pdherbemont # videolan dot>,
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import <vlc_extensions.h> #import <vlc_extensions.h>
@class VLCDialogGridView; @class VLCDialogGridView;
......
/***************************************************************************** /*****************************************************************************
* VLCUIWidgets.m: Widgets for VLC's extensions dialogs for Mac OS X * 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$ * $Id$
* *
* Authors: Pierre d'Herbemont <pdherbemont # videolan dot>, * Authors: Pierre d'Herbemont <pdherbemont # videolan dot>,
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#import "CompatibilityFixes.h"
#import "VLCUIWidgets.h" #import "VLCUIWidgets.h"
#import <stdlib.h> #import <stdlib.h>
......
/***************************************************************************** /*****************************************************************************
* VLCVoutWindowController.h: MacOS X interface module * VLCVoutWindowController.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import <vlc_vout_window.h> #import <vlc_vout_window.h>
......
/***************************************************************************** /*****************************************************************************
* VLCVoutWindowController.m: MacOS X interface module * VLCVoutWindowController.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#import "CompatibilityFixes.h"
#import "VLCVoutWindowController.h" #import "VLCVoutWindowController.h"
#import "intf.h" #import "intf.h"
#import "MainWindow.h" #import "MainWindow.h"
......
/***************************************************************************** /*****************************************************************************
* VideoView.m: MacOS X video output module * VideoView.m: MacOS X video output module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN * Copyright (C) 2002-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Derk-Jan Hartman <hartman at videolan dot org> * Authors: Derk-Jan Hartman <hartman at videolan dot org>
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#import <stdlib.h> /* free() */ #import <stdlib.h> /* free() */
#import <string.h> #import <string.h>
#import "CompatibilityFixes.h"
#import "intf.h" #import "intf.h"
#import "VideoView.h" #import "VideoView.h"
#import "CoreInteraction.h" #import "CoreInteraction.h"
......
/***************************************************************************** /*****************************************************************************
* Windows.h: MacOS X interface module * Windows.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
/***************************************************************************** /*****************************************************************************
* VLCWindow * VLCWindow
......
/***************************************************************************** /*****************************************************************************
* Windows.m: MacOS X interface module * Windows.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2012-2013 VLC authors and VideoLAN * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#import "CoreInteraction.h" #import "CoreInteraction.h"
#import "ControlsBar.h" #import "ControlsBar.h"
#import "VideoView.h" #import "VideoView.h"
#import "CompatibilityFixes.h"
/***************************************************************************** /*****************************************************************************
* VLCWindow * VLCWindow
......
/***************************************************************************** /*****************************************************************************
* intf.h: MacOS X interface module * intf.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN * Copyright (C) 2002-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#import <vlc_vout_window.h> #import <vlc_vout_window.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "SPMediaKeyTap.h" /* for the media key support */ #import "SPMediaKeyTap.h" /* for the media key support */
#import "misc.h" #import "misc.h"
#import "MainWindow.h" #import "MainWindow.h"
......
/***************************************************************************** /*****************************************************************************
* misc.h: code not specific to vlc * misc.h: code not specific to vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2013 VLC authors and VideoLAN * Copyright (C) 2003-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
/***************************************************************************** /*****************************************************************************
* NSSound (VLCAdditions) * NSSound (VLCAdditions)
......
/***************************************************************************** /*****************************************************************************
* misc.m: code not specific to vlc * misc.m: code not specific to vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2013 VLC authors and VideoLAN * Copyright (C) 2003-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#import "CompatibilityFixes.h"
#import "misc.h" #import "misc.h"
#import "intf.h" /* VLCApplication */ #import "intf.h" /* VLCApplication */
#import "MainWindow.h" #import "MainWindow.h"
......
/***************************************************************************** /*****************************************************************************
* playlist.m: MacOS X interface module * playlist.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2013 VLC authors and VideoLAN * Copyright (C) 2002-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <math.h> #include <math.h>
#include <sys/mount.h> #include <sys/mount.h>
#import "CompatibilityFixes.h"
#import "intf.h" #import "intf.h"
#import "wizard.h" #import "wizard.h"
#import "bookmarks.h" #import "bookmarks.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment