Changeset c4fef7e0c05f6e406186630b1b3566e951b805ce

Timestamp:

01/02/06 13:44:16 (3 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1138797856 +0000

git-parent:

[7fc2d7308d17b202d6a1212438bcd19985f5f92e]

git-author:

Sam Hocevar <sam@videolan.org> 1138797856 +0000

Message:

• Replaced "SYS_DARWIN" with either APPLE (meaning OS X) or ppc and
  ppc64 (meaning PowerPC).
  

Files:

• src/extras/libc.c (modified) (2 diffs)
• src/interface/interface.c (modified) (5 diffs)
• src/interface/intf_eject.c (modified) (1 diff)
• src/libvlc.c (modified) (4 diffs)
• src/libvlc.h (modified) (5 diffs)
• src/misc/charset.c (modified) (5 diffs)
• src/misc/configuration.c (modified) (1 diff)
• src/misc/cpu.c (modified) (3 diffs)
• src/misc/messages.c (modified) (3 diffs)
• src/misc/modules.c (modified) (1 diff)
• src/misc/threads.c (modified) (3 diffs)
• src/network/httpd.c (modified) (1 diff)
• src/video_output/video_output.c (modified) (1 diff)
• src/video_output/vout_intf.c (modified) (1 diff)

src/extras/libc.c

@@ -183 +183 @@
- * vasprintf:
- *****************************************************************************/
-SYS_DARWIN
+__APPLE__
-int vlc_vasprintf(char **strp, const char *fmt, va_list ap)
-{
@@ -229 +229 @@
- * asprintf:
- *****************************************************************************/
-SYS_DARWIN
+__APPLE__
-int vlc_asprintf( char **strp, const char *fmt, ... )
-{

src/interface/interface.c

@@ -46 +46 @@
-#include "video_output.h"
-
-SYS_DARWIN
-"Cocoa/Cocoa.h"
- /* SYS_DARWIN */
+__APPLE__
+<Cocoa/Cocoa.h>
+
-
-/*****************************************************************************
@@ -61 +61 @@
-                            vlc_value_t , vlc_value_t , void * );
-
-SYS_DARWIN
+__APPLE__
-/*****************************************************************************
- * VLCApplication interface
@@ -154 +154 @@
-int intf_RunThread( intf_thread_t *p_intf )
-{
-SYS_DARWIN
+__APPLE__
-    NSAutoreleasePool * o_pool;
-
@@ -309 +309 @@
-        {
-            p_intf->b_die = VLC_TRUE;
-SYS_DARWIN
+__APPLE__
-    if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) )
-    {
@@ -458 +458 @@
-}
-
-SYS_DARWIN
+__APPLE__
-/*****************************************************************************
- * VLCApplication implementation 

src/interface/intf_eject.c

@@ -102 +102 @@
-    int i_ret = VLC_SUCCESS;
-
-SYS_DARWIN
+__APPLE__
-    FILE *p_eject;
-    char *psz_disk;

src/libvlc.c

@@ -251 +251 @@
-    /* Initialize mutexes */
-    vlc_mutex_init( p_vlc, &p_vlc->config_lock );
-SYS_DARWIN
+__APPLE__
-    vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
-    vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
@@ -2014 +2014 @@
-
-    char *          psz_path;
-SYS_DARWIN
+__APPLE__
-    char            psz_tmp[1024];
-#endif
@@ -2027 +2027 @@
-    else if( psz_lang )
-    {
-SYS_DARWIN
+__APPLE__
-        /* I need that under Darwin, please check it doesn't disturb
-         * other platforms. --Meuuh */
@@ -2051 +2051 @@
-
-    /* Specify where to find the locales for current domain */
-SYS_DARWIN
+__APPLE__
-    psz_path = LOCALEDIR;
-#else

src/libvlc.h

@@ -146 +146 @@
-    "-1 (default), 48000, 44100, 32000, 22050, 16000, 11025, 8000.")
-
-SYS_DARWIN
+__APPLE__
-#define AOUT_RESAMP_TEXT N_("High quality audio resampling")
-#define AOUT_RESAMP_LONGTEXT N_( \
@@ -1055 +1055 @@
-    add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT,
-                 AOUT_RATE_LONGTEXT, VLC_TRUE );
-SYS_DARWIN
+__APPLE__
-    add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT,
-              AOUT_RESAMP_LONGTEXT, VLC_TRUE );
@@ -1091 +1091 @@
-    add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
-              QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
-SYS_DARWIN
+__APPLE__
-    add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE );
-#endif
@@ -1376 +1376 @@
-              MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
-
-SYS_DARWIN
+__APPLE__
-    add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT,
-              RT_PRIORITY_LONGTEXT, VLC_TRUE );
@@ -1468 +1468 @@
-    add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , VLC_FALSE );
-
-SYS_DARWIN
+__APPLE__
-/* Don't use the following combo's */
-

src/misc/charset.c

@@ -44 +44 @@
-#endif
-
-SYS_DARWIN
+__APPLE__
-#   include <errno.h>
-#   include <string.h>
@@ -239 +239 @@
-    const char *psz_codeset;
-
-SYS_DARWIN
+__APPLE__
-
-# if HAVE_LANGINFO_CODESET
@@ -255 +255 @@
-     * use setlocale here; it would return "C" when it doesn't support the
-     * locale name the user has set. Darwin's setlocale is broken. */
-SYS_DARWIN
+__APPLE__
-    psz_locale = setlocale( LC_ALL, NULL );
-#  endif
@@ -275 +275 @@
-# endif /* HAVE_LANGINFO_CODESET */
-
-SYS_DARWIN
+__APPLE__
-
-    /* Darwin is always using UTF-8 internally. */
@@ -346 +346 @@
-char *__vlc_fix_readdir_charset( vlc_object_t *p_this, const char *psz_string )
-{
-SYS_DARWIN
+__APPLE__
-    if ( p_this->p_libvlc->iconv_macosx != (vlc_iconv_t)-1 )
-    {

src/misc/configuration.c

@@ -1364 +1364 @@
-    p_this->p_vlc->ppsz_argv = ppsz_argv;
-
-SYS_DARWIN
+__APPLE__
-    /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
-     * is the PSN - process serial number (a unique PID-ish thingie)

src/misc/cpu.c

@@ -34 +34 @@
-#endif
-
-SYS_DARWIN
+__APPLE__
-#include <sys/sysctl.h>
-#endif
@@ -67 +67 @@
-    volatile uint32_t i_capabilities = CPU_CAPABILITY_NONE;
-
-SYS_DARWIN
+__APPLE__
-    int selectors[2] = { CTL_HW, HW_VECTORUNIT };
-    int i_has_altivec = 0;
@@ -268 +268 @@
-    return i_capabilities;
-
-
+ || defined( __ppc__ ) || defined( __ppc64__ )
-
-#   ifdef CAN_COMPILE_ALTIVEC && defined( HAVE_SIGNAL_H )

src/misc/messages.c

@@ -303 +303 @@
-    msg_item_t   item;                    /* message in case of a full queue */
-
-SYS_DARWIN
+__APPLE__
-    int          i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
-#endif
@@ -318 +318 @@
-     * Convert message to string
-     */
-SYS_DARWIN
+__APPLE__
-    vlc_va_copy( args, _args );
-    vasprintf( &psz_str, psz_format, args );
@@ -364 +364 @@
-    }
-
-SYS_DARWIN
+__APPLE__
-    vlc_va_copy( args, _args );
-    vsnprintf( psz_str, i_size, psz_format, args );

src/misc/modules.c

@@ -764 +764 @@
-        if( !(*ppsz_path)[0] ) continue;
-
-SYS_DARWIN
+__APPLE__
-
-        /* Handle relative as well as absolute paths */

src/misc/threads.c

@@ -572 +572 @@
-    i_ret = pthread_create( &p_this->thread_id, NULL, func, p_data );
-
-SYS_DARWIN
+__APPLE__
-    if( config_GetInt( p_this, "rt-priority" ) )
-#endif
@@ -602 +602 @@
-        }
-    }
-SYS_DARWIN
+__APPLE__
-    else
-    {
@@ -662 +662 @@
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-SYS_DARWIN
+__APPLE__
-    if( config_GetInt( p_this, "rt-priority" ) )
-#endif

src/network/httpd.c

@@ -1466 +1466 @@
-
-    va_start( args, psz_value );
-SYS_DARWIN
+__APPLE__
-    vasprintf( &value, psz_value, args );
-#else

src/video_output/video_output.c

@@ -44 +44 @@
-#include "vlc_playlist.h"
-
-SYS_DARWIN
+__APPLE__
-#include "darwin_specific.h"
-#endif

src/video_output/vout_intf.c

@@ -377 +377 @@
-    }
-
-SYS_DARWIN
+__APPLE__
-    if( !val.psz_string && p_vout->p_vlc->psz_homedir )
-    {