Skip to content

V
vlc-gpu
Commit b76d7cf6 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* Got rid of SYS_DARWIN everywhere.

parent c4fef7e0
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
include/main.h
View file @ b76d7cf6
...@@ -70,7 +70,7 @@ struct libvlc_t ...@@ -70,7 +70,7 @@ struct libvlc_t
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
vlc_object_t * p_appthread; vlc_object_t * p_appthread;
char * psz_vlcpath; char * psz_vlcpath;
#elif defined( SYS_DARWIN ) #elif defined( __APPLE__ )
char * psz_vlcpath; char * psz_vlcpath;
vlc_iconv_t iconv_macosx; /* for HFS+ file names */ vlc_iconv_t iconv_macosx; /* for HFS+ file names */
vlc_mutex_t iconv_lock; vlc_mutex_t iconv_lock;
...@@ -110,7 +110,7 @@ struct vlc_t ...@@ -110,7 +110,7 @@ struct vlc_t
/* Locks */ /* Locks */
vlc_mutex_t config_lock; /* lock for the config file */ vlc_mutex_t config_lock; /* lock for the config file */
#ifdef SYS_DARWIN #ifdef __APPLE__
vlc_mutex_t quicktime_lock; /* QT is not thread safe on OSX */ vlc_mutex_t quicktime_lock; /* QT is not thread safe on OSX */
#endif #endif
......
include/os_specific.h
View file @ b76d7cf6
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#if defined( SYS_BEOS ) #if defined( SYS_BEOS )
# include "beos_specific.h" # include "beos_specific.h"
#elif defined( SYS_DARWIN ) #elif defined( __APPLE__ )
# include "darwin_specific.h" # include "darwin_specific.h"
#elif defined( WIN32 ) || defined( UNDER_CE ) #elif defined( WIN32 ) || defined( UNDER_CE )
# include "win32_specific.h" # include "win32_specific.h"
......
include/vlc_common.h
View file @ b76d7cf6
...@@ -796,14 +796,14 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) ...@@ -796,14 +796,14 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
# define vlc_strdup NULL # define vlc_strdup NULL
#endif #endif
#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) #if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
# define vasprintf vlc_vasprintf # define vasprintf vlc_vasprintf
VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) ); VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) );
#elif !defined(__PLUGIN__) #elif !defined(__PLUGIN__)
# define vlc_vasprintf NULL # define vlc_vasprintf NULL
#endif #endif
#if !defined(HAVE_ASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) #if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
# define asprintf vlc_asprintf # define asprintf vlc_asprintf
VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ); VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) );
#elif !defined(__PLUGIN__) #elif !defined(__PLUGIN__)
......
include/vlc_config.h
View file @ b76d7cf6
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
/* The configuration file and directory */ /* The configuration file and directory */
#ifdef SYS_BEOS #ifdef SYS_BEOS
# define CONFIG_DIR "config/settings/VideoLAN Client" # define CONFIG_DIR "config/settings/VideoLAN Client"
#elif SYS_DARWIN #elif __APPLE__
# define CONFIG_DIR "Library/Preferences/VLC" # define CONFIG_DIR "Library/Preferences/VLC"
#elif defined( WIN32 ) || defined( UNDER_CE ) #elif defined( WIN32 ) || defined( UNDER_CE )
# define CONFIG_DIR "vlc" # define CONFIG_DIR "vlc"
......
include/vlc_threads.h
View file @ b76d7cf6
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
*****************************************************************************/ *****************************************************************************/
/* Thread priorities */ /* Thread priorities */
#ifdef SYS_DARWIN #ifdef __APPLE__
# define VLC_THREAD_PRIORITY_LOW (-47) # define VLC_THREAD_PRIORITY_LOW (-47)
# define VLC_THREAD_PRIORITY_INPUT 37 # define VLC_THREAD_PRIORITY_INPUT 37
# define VLC_THREAD_PRIORITY_AUDIO 37 # define VLC_THREAD_PRIORITY_AUDIO 37
......
modules/access/vcd/cdrom.c
View file @ b76d7cf6
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#if defined( SYS_BSDI ) #if defined( SYS_BSDI )
# include <dvd.h> # include <dvd.h>
#elif defined ( SYS_DARWIN ) #elif defined ( __APPLE__ )
# include <CoreFoundation/CFBase.h> # include <CoreFoundation/CFBase.h>
# include <IOKit/IOKitLib.h> # include <IOKit/IOKitLib.h>
# include <IOKit/storage/IOCDTypes.h> # include <IOKit/storage/IOCDTypes.h>
...@@ -221,7 +221,7 @@ int ioctl_GetTracksMap( vlc_object_t *p_this, const vcddev_t *p_vcddev, ...@@ -221,7 +221,7 @@ int ioctl_GetTracksMap( vlc_object_t *p_this, const vcddev_t *p_vcddev,
* vcd device mode * vcd device mode
*/ */
#if defined( SYS_DARWIN ) #if defined( __APPLE__ )
CDTOC *pTOC; CDTOC *pTOC;
int i_descriptors; int i_descriptors;
...@@ -581,7 +581,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev, ...@@ -581,7 +581,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
* vcd device mode * vcd device mode
*/ */
#if defined( SYS_DARWIN ) #if defined( __APPLE__ )
dk_cd_read_t cd_read; dk_cd_read_t cd_read;
memset( &cd_read, 0, sizeof(cd_read) ); memset( &cd_read, 0, sizeof(cd_read) );
...@@ -953,7 +953,7 @@ static void CloseVCDImage( vlc_object_t * p_this, vcddev_t *p_vcddev ) ...@@ -953,7 +953,7 @@ static void CloseVCDImage( vlc_object_t * p_this, vcddev_t *p_vcddev )
free( p_vcddev->p_sectors ); free( p_vcddev->p_sectors );
} }
#if defined( SYS_DARWIN ) #if defined( __APPLE__ )
/**************************************************************************** /****************************************************************************
* darwin_getTOC: get the TOC * darwin_getTOC: get the TOC
****************************************************************************/ ****************************************************************************/
...@@ -1098,7 +1098,7 @@ static int darwin_getNumberOfTracks( CDTOC *pTOC, int i_descriptors ) ...@@ -1098,7 +1098,7 @@ static int darwin_getNumberOfTracks( CDTOC *pTOC, int i_descriptors )
return( i_tracks ); return( i_tracks );
} }
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
#if defined( WIN32 ) #if defined( WIN32 )
/***************************************************************************** /*****************************************************************************
......
modules/access/vcd/cdrom_internals.h
View file @ b76d7cf6
...@@ -66,7 +66,7 @@ struct vcddev_s ...@@ -66,7 +66,7 @@ struct vcddev_s
/***************************************************************************** /*****************************************************************************
* Platform specifics * Platform specifics
*****************************************************************************/ *****************************************************************************/
#if defined( SYS_DARWIN ) #if defined( __APPLE__ )
#define darwin_freeTOC( p ) free( (void*)p ) #define darwin_freeTOC( p ) free( (void*)p )
#define CD_MIN_TRACK_NO 01 #define CD_MIN_TRACK_NO 01
#define CD_MAX_TRACK_NO 99 #define CD_MAX_TRACK_NO 99
...@@ -204,7 +204,7 @@ struct SRB_ExecSCSICmd ...@@ -204,7 +204,7 @@ struct SRB_ExecSCSICmd
static int OpenVCDImage( vlc_object_t *, const char *, struct vcddev_s * ); static int OpenVCDImage( vlc_object_t *, const char *, struct vcddev_s * );
static void CloseVCDImage( vlc_object_t *, struct vcddev_s * ); static void CloseVCDImage( vlc_object_t *, struct vcddev_s * );
#if defined( SYS_DARWIN ) #if defined( __APPLE__ )
static CDTOC *darwin_getTOC( vlc_object_t *, const struct vcddev_s * ); static CDTOC *darwin_getTOC( vlc_object_t *, const struct vcddev_s * );
static int darwin_getNumberOfDescriptors( CDTOC * ); static int darwin_getNumberOfDescriptors( CDTOC * );
static int darwin_getNumberOfTracks( CDTOC *, int ); static int darwin_getNumberOfTracks( CDTOC *, int );
......
modules/audio_filter/resampler/bandlimited.c
View file @ b76d7cf6
...@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#if !defined( SYS_DARWIN ) #if !defined( __APPLE__ )
if( !config_GetInt( p_this, "hq-resampling" ) ) if( !config_GetInt( p_this, "hq-resampling" ) )
{ {
return VLC_EGENERIC; return VLC_EGENERIC;
......
modules/codec/cmml/browser_open.c
View file @ b76d7cf6
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
int browser_Open( const char *psz_url ) int browser_Open( const char *psz_url )
{ {
#ifdef SYS_DARWIN #ifdef __APPLE__
char *psz_open_commandline; char *psz_open_commandline;
psz_open_commandline = strdup( "/usr/bin/open " ); psz_open_commandline = strdup( "/usr/bin/open " );
......
modules/codec/mpeg_audio.c
View file @ b76d7cf6
...@@ -106,7 +106,7 @@ vlc_module_begin(); ...@@ -106,7 +106,7 @@ vlc_module_begin();
set_description( _("MPEG audio layer I/II/III parser") ); set_description( _("MPEG audio layer I/II/III parser") );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC ); set_subcategory( SUBCAT_INPUT_ACODEC );
#if defined(SYS_DARWIN) || defined(UNDER_CE) #if defined(__APPLE__) || defined(UNDER_CE)
set_capability( "decoder", 5 ); set_capability( "decoder", 5 );
#else #else
set_capability( "decoder", 100 ); set_capability( "decoder", 100 );
......
modules/codec/quicktime.c
View file @ b76d7cf6
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc/decoder.h> #include <vlc/decoder.h>
#if !defined (SYS_DARWIN) && !defined(WIN32) #if !defined (__APPLE__) && !defined(WIN32)
# define LOADER 1 # define LOADER 1
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE__
#include <QuickTime/QuickTimeComponents.h> #include <QuickTime/QuickTimeComponents.h>
#include <QuickTime/Movies.h> #include <QuickTime/Movies.h>
#include <QuickTime/ImageCodec.h> #include <QuickTime/ImageCodec.h>
...@@ -83,7 +83,7 @@ static picture_t *DecodeVideo( decoder_t *, block_t ** ); ...@@ -83,7 +83,7 @@ static picture_t *DecodeVideo( decoder_t *, block_t ** );
#define FCC( a, b , c, d ) \ #define FCC( a, b , c, d ) \
((uint32_t)( ((a)<<24)|((b)<<16)|((c)<<8)|(d))) ((uint32_t)( ((a)<<24)|((b)<<16)|((c)<<8)|(d)))
#ifndef SYS_DARWIN #ifndef __APPLE__
typedef struct OpaqueSoundConverter* SoundConverter; typedef struct OpaqueSoundConverter* SoundConverter;
#ifndef LOADER #ifndef LOADER
typedef long OSType; typedef long OSType;
...@@ -103,12 +103,12 @@ typedef struct SoundComponentData { ...@@ -103,12 +103,12 @@ typedef struct SoundComponentData {
long reserved; long reserved;
} SoundComponentData; } SoundComponentData;
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
struct decoder_sys_t struct decoder_sys_t
{ {
/* library */ /* library */
#ifndef SYS_DARWIN #ifndef __APPLE__
#ifdef LOADER #ifdef LOADER
ldt_fs_t *ldt_fs; ldt_fs_t *ldt_fs;
#endif /* LOADER */ #endif /* LOADER */
...@@ -117,7 +117,7 @@ struct decoder_sys_t ...@@ -117,7 +117,7 @@ struct decoder_sys_t
HINSTANCE qts; HINSTANCE qts;
OSErr (*InitializeQTML) ( long flags ); OSErr (*InitializeQTML) ( long flags );
OSErr (*TerminateQTML) ( void ); OSErr (*TerminateQTML) ( void );
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
/* Audio */ /* Audio */
int (*SoundConverterOpen) ( const SoundComponentData *, int (*SoundConverterOpen) ( const SoundComponentData *,
...@@ -288,7 +288,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -288,7 +288,7 @@ static void Close( vlc_object_t *p_this )
/* get lock, avoid segfault */ /* get lock, avoid segfault */
var_Get( p_dec->p_libvlc, "qt_mutex", &lockval ); var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address ); vlc_mutex_lock( lockval.p_address );
#ifdef SYS_DARWIN #ifdef __APPLE__
/* on OS X QT is not threadsafe */ /* on OS X QT is not threadsafe */
vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock ); vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock );
#endif #endif
...@@ -314,7 +314,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -314,7 +314,7 @@ static void Close( vlc_object_t *p_this )
if( p_sys->plane) free( p_sys->plane ); if( p_sys->plane) free( p_sys->plane );
} }
#ifndef SYS_DARWIN #ifndef __APPLE__
FreeLibrary( p_sys->qtml ); FreeLibrary( p_sys->qtml );
FreeLibrary( p_sys->qts ); FreeLibrary( p_sys->qts );
msg_Dbg( p_dec, "FreeLibrary ok." ); msg_Dbg( p_dec, "FreeLibrary ok." );
...@@ -330,7 +330,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -330,7 +330,7 @@ static void Close( vlc_object_t *p_this )
#endif #endif
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE__
vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock ); vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
#endif #endif
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
...@@ -362,12 +362,12 @@ static int OpenAudio( decoder_t *p_dec ) ...@@ -362,12 +362,12 @@ static int OpenAudio( decoder_t *p_dec )
/* get lock, avoid segfault */ /* get lock, avoid segfault */
var_Get( p_dec->p_libvlc, "qt_mutex", &lockval ); var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address ); vlc_mutex_lock( lockval.p_address );
#ifdef SYS_DARWIN #ifdef __APPLE__
/* on OS X QT is not threadsafe */ /* on OS X QT is not threadsafe */
vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock ); vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock );
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE__
EnterMovies(); EnterMovies();
#endif #endif
...@@ -377,7 +377,7 @@ static int OpenAudio( decoder_t *p_dec ) ...@@ -377,7 +377,7 @@ static int OpenAudio( decoder_t *p_dec )
goto exit_error; goto exit_error;
} }
#ifndef SYS_DARWIN #ifndef __APPLE__
if( ( i_error = p_sys->InitializeQTML( 6 + 16 ) ) ) if( ( i_error = p_sys->InitializeQTML( 6 + 16 ) ) )
{ {
msg_Dbg( p_dec, "error on InitializeQTML = %d", i_error ); msg_Dbg( p_dec, "error on InitializeQTML = %d", i_error );
...@@ -476,7 +476,7 @@ static int OpenAudio( decoder_t *p_dec ) ...@@ -476,7 +476,7 @@ static int OpenAudio( decoder_t *p_dec )
p_sys->i_out = 0; p_sys->i_out = 0;
p_sys->i_out_frames = 0; p_sys->i_out_frames = 0;
#ifdef SYS_DARWIN #ifdef __APPLE__
vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock ); vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
#endif #endif
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
...@@ -487,7 +487,7 @@ exit_error: ...@@ -487,7 +487,7 @@ exit_error:
#ifdef LOADER #ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs ); Restore_LDT_Keeper( p_sys->ldt_fs );
#endif #endif
#ifdef SYS_DARWIN #ifdef __APPLE__
vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock ); vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
#endif #endif
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
...@@ -672,7 +672,7 @@ static int OpenVideo( decoder_t *p_dec ) ...@@ -672,7 +672,7 @@ static int OpenVideo( decoder_t *p_dec )
var_Get( p_dec->p_libvlc, "qt_mutex", &lockval ); var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address ); vlc_mutex_lock( lockval.p_address );
#ifdef SYS_DARWIN #ifdef __APPLE__
EnterMovies(); EnterMovies();
#endif #endif
...@@ -682,7 +682,7 @@ static int OpenVideo( decoder_t *p_dec ) ...@@ -682,7 +682,7 @@ static int OpenVideo( decoder_t *p_dec )
goto exit_error; goto exit_error;
} }
#ifndef SYS_DARWIN #ifndef __APPLE__
if( ( i_result = p_sys->InitializeQTML( 6 + 16 ) ) ) if( ( i_result = p_sys->InitializeQTML( 6 + 16 ) ) )
{ {
msg_Dbg( p_dec, "error on InitializeQTML = %d", (int)i_result ); msg_Dbg( p_dec, "error on InitializeQTML = %d", (int)i_result );
...@@ -919,7 +919,7 @@ static int QTAudioInit( decoder_t *p_dec ) ...@@ -919,7 +919,7 @@ static int QTAudioInit( decoder_t *p_dec )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
#ifdef SYS_DARWIN #ifdef __APPLE__
p_sys->SoundConverterOpen = (void*)SoundConverterOpen; p_sys->SoundConverterOpen = (void*)SoundConverterOpen;
p_sys->SoundConverterClose = (void*)SoundConverterClose; p_sys->SoundConverterClose = (void*)SoundConverterClose;
p_sys->SoundConverterSetInfo = (void*)SoundConverterSetInfo; p_sys->SoundConverterSetInfo = (void*)SoundConverterSetInfo;
...@@ -974,7 +974,7 @@ static int QTAudioInit( decoder_t *p_dec ) ...@@ -974,7 +974,7 @@ static int QTAudioInit( decoder_t *p_dec )
} }
msg_Dbg( p_dec, "Standard init done" ); msg_Dbg( p_dec, "Standard init done" );
#endif /* else SYS_DARWIN */ #endif /* else __APPLE__ */
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -987,7 +987,7 @@ static int QTVideoInit( decoder_t *p_dec ) ...@@ -987,7 +987,7 @@ static int QTVideoInit( decoder_t *p_dec )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
#ifdef SYS_DARWIN #ifdef __APPLE__
p_sys->FindNextComponent = (void*)FindNextComponent; p_sys->FindNextComponent = (void*)FindNextComponent;
p_sys->OpenComponent = (void*)OpenComponent; p_sys->OpenComponent = (void*)OpenComponent;
p_sys->ImageCodecInitialize = (void*)ImageCodecInitialize; p_sys->ImageCodecInitialize = (void*)ImageCodecInitialize;
...@@ -1047,7 +1047,7 @@ static int QTVideoInit( decoder_t *p_dec ) ...@@ -1047,7 +1047,7 @@ static int QTVideoInit( decoder_t *p_dec )
msg_Err( p_dec, "failed getting proc address" ); msg_Err( p_dec, "failed getting proc address" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
modules/control/http/http.c
View file @ b76d7cf6
...@@ -83,7 +83,7 @@ static void Run ( intf_thread_t *p_intf ); ...@@ -83,7 +83,7 @@ static void Run ( intf_thread_t *p_intf );
/***************************************************************************** /*****************************************************************************
* Local functions * Local functions
*****************************************************************************/ *****************************************************************************/
#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && !defined(WIN32) #if !defined(__APPLE__) && !defined(SYS_BEOS) && !defined(WIN32)
static int DirectoryCheck( char *psz_dir ) static int DirectoryCheck( char *psz_dir )
{ {
DIR *p_dir; DIR *p_dir;
...@@ -271,7 +271,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -271,7 +271,7 @@ static int Open( vlc_object_t *p_this )
p_sys->i_files = 0; p_sys->i_files = 0;
p_sys->pp_files = NULL; p_sys->pp_files = NULL;
#if defined(SYS_DARWIN) || defined(SYS_BEOS) || defined(WIN32) #if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL ) if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL )
{ {
char * psz_vlcpath = p_intf->p_libvlc->psz_vlcpath; char * psz_vlcpath = p_intf->p_libvlc->psz_vlcpath;
......
modules/demux/mkv.cpp
View file @ b76d7cf6
...@@ -4618,7 +4618,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) ...@@ -4618,7 +4618,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info )
msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() );
} }
#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) #if defined( HAVE_GMTIME_R ) && !defined( __APPLE__ )
else if( MKV_IS_ID( l, KaxDateUTC ) ) else if( MKV_IS_ID( l, KaxDateUTC ) )
{ {
KaxDateUTC &date = *(KaxDateUTC*)l; KaxDateUTC &date = *(KaxDateUTC*)l;
......
modules/gui/wxwidgets/dialogs/updatevlc.cpp
View file @ b76d7cf6
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
# define UPDATE_VLC_OS "windows" # define UPDATE_VLC_OS "windows"
# define UPDATE_VLC_ARCH "i386" # define UPDATE_VLC_ARCH "i386"
#else #else
#ifdef SYS_DARWIN #ifdef __APPLE__
# define UPDATE_VLC_OS "macosx" # define UPDATE_VLC_OS "macosx"
# define UPDATE_VLC_ARCH "ppc" # define UPDATE_VLC_ARCH "ppc"
#else #else
......
modules/misc/freetype.c
View file @ b76d7cf6
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_GLYPH_H #include FT_GLYPH_H
#ifdef SYS_DARWIN #ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont" #define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
#elif defined( SYS_BEOS ) #elif defined( SYS_BEOS )
#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf" #define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
...@@ -248,7 +248,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -248,7 +248,7 @@ static int Create( vlc_object_t *p_this )
#ifdef WIN32 #ifdef WIN32
GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 ); GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
strcat( psz_fontfile, "\\fonts\\arial.ttf" ); strcat( psz_fontfile, "\\fonts\\arial.ttf" );
#elif SYS_DARWIN #elif __APPLE__
strcpy( psz_fontfile, DEFAULT_FONT ); strcpy( psz_fontfile, DEFAULT_FONT );
#else #else
msg_Err( p_filter, "user didn't specify a font" ); msg_Err( p_filter, "user didn't specify a font" );
......
modules/misc/logger.c
View file @ b76d7cf6
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#define MODE_HTML 1 #define MODE_HTML 1
#define MODE_SYSLOG 2 #define MODE_SYSLOG 2
#ifdef SYS_DARWIN #ifdef __APPLE__
#define LOG_DIR "Library/Logs/" #define LOG_DIR "Library/Logs/"
#endif #endif
...@@ -193,7 +193,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -193,7 +193,7 @@ static int Open( vlc_object_t *p_this )
psz_file = config_GetPsz( p_intf, "logfile" ); psz_file = config_GetPsz( p_intf, "logfile" );
if( !psz_file ) if( !psz_file )
{ {
#ifdef SYS_DARWIN #ifdef __APPLE__
char *psz_homedir = p_this->p_vlc->psz_homedir; char *psz_homedir = p_this->p_vlc->psz_homedir;
if( !psz_homedir ) if( !psz_homedir )
......
modules/video_output/opengl.c
View file @ b76d7cf6
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#ifdef SYS_DARWIN #ifdef __APPLE__
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glext.h> #include <OpenGL/glext.h>
...@@ -133,7 +133,7 @@ vlc_module_begin(); ...@@ -133,7 +133,7 @@ vlc_module_begin();
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT ); set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("OpenGL video output") ); set_description( _("OpenGL video output") );
#ifdef SYS_DARWIN #ifdef __APPLE__
set_capability( "video output", 200 ); set_capability( "video output", 200 );
#else #else
set_capability( "video output", 20 ); set_capability( "video output", 20 );
...@@ -187,7 +187,7 @@ static int CreateVout( vlc_object_t *p_this ) ...@@ -187,7 +187,7 @@ static int CreateVout( vlc_object_t *p_this )
var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
p_sys->i_index = 0; p_sys->i_index = 0;
#ifdef SYS_DARWIN #ifdef __APPLE__
p_sys->i_tex_width = p_vout->fmt_in.i_width; p_sys->i_tex_width = p_vout->fmt_in.i_width;
p_sys->i_tex_height = p_vout->fmt_in.i_height; p_sys->i_tex_height = p_vout->fmt_in.i_height;
#else #else
...@@ -268,7 +268,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -268,7 +268,7 @@ static int Init( vout_thread_t *p_vout )
p_sys->p_vout->pf_init( p_sys->p_vout ); p_sys->p_vout->pf_init( p_sys->p_vout );
#if defined( SYS_DARWIN ) || (VLCGL_FORMAT == YCBCR_MESA) #if defined( __APPLE__ ) || (VLCGL_FORMAT == YCBCR_MESA)
p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
i_pixel_pitch = 2; i_pixel_pitch = 2;
...@@ -478,7 +478,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -478,7 +478,7 @@ static int Manage( vout_thread_t *p_vout )
i_ret = p_sys->p_vout->pf_manage( p_sys->p_vout ); i_ret = p_sys->p_vout->pf_manage( p_sys->p_vout );
p_vout->i_changes = p_sys->p_vout->i_changes; p_vout->i_changes = p_sys->p_vout->i_changes;
#ifdef SYS_DARWIN #ifdef __APPLE__
if( p_sys->p_vout->pf_lock && if( p_sys->p_vout->pf_lock &&
p_sys->p_vout->pf_lock( p_sys->p_vout ) ) p_sys->p_vout->pf_lock( p_sys->p_vout ) )
{ {
...@@ -558,7 +558,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -558,7 +558,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
return; return;
} }
#ifdef SYS_DARWIN #ifdef __APPLE__
int i_new_index; int i_new_index;
i_new_index = ( p_sys->i_index + 1 ) & 1; i_new_index = ( p_sys->i_index + 1 ) & 1;
...@@ -608,7 +608,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -608,7 +608,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
/* glTexCoord works differently with GL_TEXTURE_2D and /* glTexCoord works differently with GL_TEXTURE_2D and
GL_TEXTURE_RECTANGLE_EXT */ GL_TEXTURE_RECTANGLE_EXT */
#ifdef SYS_DARWIN #ifdef __APPLE__
f_x = (float)p_vout->fmt_out.i_x_offset; f_x = (float)p_vout->fmt_out.i_x_offset;
f_y = (float)p_vout->fmt_out.i_y_offset; f_y = (float)p_vout->fmt_out.i_y_offset;
f_width = (float)p_vout->fmt_out.i_x_offset + f_width = (float)p_vout->fmt_out.i_x_offset +
...@@ -749,7 +749,7 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -749,7 +749,7 @@ static int InitTextures( vout_thread_t *p_vout )
glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
#ifdef SYS_DARWIN #ifdef __APPLE__
/* Tell the driver not to make a copy of the texture but to use /* Tell the driver not to make a copy of the texture but to use
our buffer */ our buffer */
glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE ); glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE );
......
modules/video_output/x11/xcommon.c
View file @ b76d7cf6
...@@ -1958,7 +1958,7 @@ static int InitDisplay( vout_thread_t *p_vout ) ...@@ -1958,7 +1958,7 @@ static int InitDisplay( vout_thread_t *p_vout )
if( config_GetInt( p_vout, MODULE_STRING "-shm" ) ) if( config_GetInt( p_vout, MODULE_STRING "-shm" ) )
{ {
# ifdef SYS_DARWIN # ifdef __APPLE__
/* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */ /* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */
# else # else
p_vout->p_sys->b_shm = p_vout->p_sys->b_shm =
......
src/vlc.c
View file @ b76d7cf6
...@@ -54,7 +54,7 @@ int main( int i_argc, char *ppsz_argv[] ) ...@@ -54,7 +54,7 @@ int main( int i_argc, char *ppsz_argv[] )
{ {
int i_ret; int i_ret;
#ifndef SYS_DARWIN #ifndef __APPLE__
/* This clutters OSX GUI error logs */ /* This clutters OSX GUI error logs */
fprintf( stderr, "VLC media player %s\n", VLC_Version() ); fprintf( stderr, "VLC media player %s\n", VLC_Version() );
#endif #endif
......
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