X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=1d142d7da77a0bee5371fc24f5b4812eb4517453;hb=ff02bf907b6272b898612724634371bc95b8a5f1;hp=3b4dd1c6e874b69cfd3500e3a720ab0048b813d0;hpb=2dcc933b00857f189004d08ec62f33b9ebfa20af;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index 3b4dd1c6e8..1d142d7da7 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -29,19 +29,10 @@ * This file is a collection of common definitions and types */ -#ifndef PACKAGE -/* Temporary regression test */ -#error You probably forgot to include config.h!! -#endif - /***************************************************************************** * Required vlc headers *****************************************************************************/ -#if defined( __BORLANDC__ ) -# undef HAVE_VARIADIC_MACROS -# undef HAVE_STDINT_H -# undef HAVE_INTTYPES_H -#elif defined( _MSC_VER ) +#if defined( _MSC_VER ) # pragma warning( disable : 4244 ) #endif @@ -55,69 +46,11 @@ #include #include - -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include /***************************************************************************** * Basic types definitions *****************************************************************************/ -#if defined( HAVE_STDINT_H ) -# include -#elif defined( HAVE_INTTYPES_H ) -# include -#elif defined( SYS_CYGWIN ) -# include - /* Cygwin only defines half of these... */ - typedef u_int8_t uint8_t; - typedef u_int16_t uint16_t; - typedef u_int32_t uint32_t; - typedef u_int64_t uint64_t; -#else - /* Fallback types (very x86-centric, sorry) */ - typedef unsigned char uint8_t; - typedef signed char int8_t; - typedef unsigned short uint16_t; - typedef signed short int16_t; - typedef unsigned int uint32_t; - typedef signed int int32_t; -# if defined( _MSC_VER ) \ - || defined( UNDER_CE ) \ - || ( defined( WIN32 ) && !defined( __MINGW32__ ) ) - typedef unsigned __int64 uint64_t; - typedef signed __int64 int64_t; -# else - typedef unsigned long long uint64_t; - typedef signed long long int64_t; -# endif - typedef uint32_t uintptr_t; - typedef int32_t intptr_t; -#endif - -typedef uint8_t byte_t; - -/* Systems that don't have stdint.h may not define INT64_MIN and - INT64_MAX */ -#ifndef INT64_MIN -#define INT64_MIN (-9223372036854775807LL-1) -#endif -#ifndef INT64_MAX -#define INT64_MAX (9223372036854775807LL) -#endif - -/* ptrdiff_t definition */ -#ifdef HAVE_STDDEF_H -# include -#else -# include -# ifndef _PTRDIFF_T -# define _PTRDIFF_T -/* Not portable in a 64-bit environment. */ -typedef int ptrdiff_t; -# endif -#endif - #if defined( WIN32 ) || defined( UNDER_CE ) # include # ifndef PATH_MAX @@ -174,17 +107,7 @@ typedef uint32_t vlc_fourcc_t; static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc ) { -#ifdef WORDS_BIGENDIAN - psz_fourcc[0] = (uint32_t) (fcc >> 24); - psz_fourcc[1] = (uint32_t) (fcc >> 16); - psz_fourcc[2] = (uint32_t) (fcc >> 8); - psz_fourcc[3] = (uint32_t) (fcc); -#else - psz_fourcc[3] = (uint32_t) (fcc >> 24); - psz_fourcc[2] = (uint32_t) (fcc >> 16); - psz_fourcc[1] = (uint32_t) (fcc >> 8); - psz_fourcc[0] = (uint32_t) (fcc); -#endif + memcpy( psz_fourcc, &fcc, 4 ); } #define vlc_fourcc_to_char( a, b ) \ @@ -195,7 +118,6 @@ static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc ) *****************************************************************************/ /* Internal types */ -typedef struct libvlc_global_data_t libvlc_global_data_t; typedef struct libvlc_int_t libvlc_int_t; typedef struct variable_t variable_t; typedef struct date_t date_t; @@ -204,8 +126,6 @@ typedef struct dict_t dict_t; typedef struct gc_object_t gc_object_t ; /* Messages */ -typedef struct msg_bank_t msg_bank_t; -typedef struct msg_queue_t msg_queue_t; typedef struct msg_subscription_t msg_subscription_t; /* Playlist */ @@ -216,7 +136,6 @@ typedef struct msg_subscription_t msg_subscription_t; */ typedef enum { PLAYLIST_PLAY, /**< No arg. res=can fail*/ - PLAYLIST_AUTOPLAY, /**< No arg. res=cant fail*/ PLAYLIST_VIEWPLAY, /**< arg1= playlist_item_t*,*/ /** arg2 = playlist_item_t* , res=can fail */ PLAYLIST_PAUSE, /**< No arg res=can fail*/ @@ -468,42 +387,35 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ * Plug-in stuff *****************************************************************************/ -#include "vlc_modules_macros.h" - #if defined (WIN32) && defined (DLL_EXPORT) # ifdef __cplusplus -# define VLC_PUBLIC_API __declspec(dllexport) -# define VLC_PRIVATE_API __declspec(dllexport) +# define VLC_PUBLIC_API extern "C" __declspec(dllexport) # define VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args # define VLC_INTERNAL( type, name, args ) extern "C" type name args # else # define VLC_PUBLIC_API extern __declspec(dllexport) -# define VLC_PRIVATE_API extern __declspec(dllexport) # define VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args # define VLC_INTERNAL( type, name, args ) type name args # endif #else # ifdef __cplusplus -# if HAVE_ATTRIBUTE_VISIBILITY -# define VLC_PUBLIC_API __attribute__((visibility("default"))) -# define VLC_PRIVATE_API __attribute__((visibility("default"))) +# ifdef HAVE_ATTRIBUTE_VISIBILITY +# define VLC_PUBLIC_API extern "C" __attribute__((visibility("default"))) # define VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args # define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args # else -# define VLC_PUBLIC_API +# define VLC_PUBLIC_API extern "C" # define VLC_EXPORT( type, name, args ) extern "C" type name args # define VLC_INTERNAL( type, name, args ) extern "C" type name args # endif # else -# if HAVE_ATTRIBUTE_VISIBILITY +# ifdef HAVE_ATTRIBUTE_VISIBILITY # define VLC_PUBLIC_API extern __attribute__((visibility("default"))) -# define VLC_PRIVATE_API extern __attribute__((visibility("default"))) # define VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args # define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args # else # define VLC_PUBLIC_API extern -# define VLC_PRIVATE_API extern -# define VLC_EXPORT( type, name, args ) type name args +# define VLC_EXPORT( type, name, args ) extern type name args # define VLC_INTERNAL( type, name, args ) type name args # endif # endif @@ -522,6 +434,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ # endif #endif +#include "vlc_mtime.h" #include "vlc_threads.h" typedef struct vlc_object_internals_t vlc_object_internals_t; @@ -536,11 +449,10 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; * these members are common for all vlc objects \ */ \ /**@{*/ \ - vlc_object_internals_t *p_internals; \ int i_object_id; \ int i_object_type; \ const char *psz_object_type; \ - const char *psz_object_name; \ + char *psz_object_name; \ \ /* Messages header */ \ char *psz_header; \ @@ -551,17 +463,15 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; vlc_cond_t object_wait; \ \ /* Object properties */ \ - volatile vlc_bool_t b_error; /**< set by the object */ \ - volatile vlc_bool_t b_die; /**< set by the outside */ \ - volatile vlc_bool_t b_dead; /**< set by the object */ \ - vlc_bool_t b_force; /**< set by the outside (eg. module_Need()) */ \ + volatile bool b_error; /**< set by the object */ \ + volatile bool b_die; /**< set by the outside */ \ + volatile bool b_dead; /**< set by the object */ \ + bool b_force; /**< set by the outside (eg. module_Need()) */ \ \ /* Stuff related to the libvlc structure */ \ libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \ \ vlc_object_t * p_parent; /**< our parent */ \ - vlc_object_t ** pp_children; /**< our children */ \ - volatile int i_children; \ \ /* Private data */ \ void * p_private; \ @@ -572,7 +482,7 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; /* VLC_OBJECT: attempt at doing a clever cast */ #define VLC_OBJECT( x ) \ - ((vlc_object_t *)(x))+0*(x)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct + (((vlc_object_t *)(x))+0*(x)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct) #define VLC_GC_MEMBERS \ /** \name VLC_GC_MEMBERS \ @@ -589,12 +499,8 @@ struct gc_object_t VLC_GC_MEMBERS }; -#include /* FIXME: should not be included here */ - static inline void __vlc_gc_incref( gc_object_t * p_gc ) { - assert( p_gc->i_gc_refcount > 0 ); - p_gc->i_gc_refcount ++; }; @@ -602,8 +508,6 @@ static inline void __vlc_gc_decref( gc_object_t *p_gc ) { if( !p_gc ) return; - assert( p_gc->i_gc_refcount > 0 ); - p_gc->i_gc_refcount -- ; if( p_gc->i_gc_refcount == 0 ) @@ -786,19 +690,16 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) SetDWBE( p, ( i_qw >> 32)&0xffffffff ); } +#define hton16(i) htons(i) +#define hton32(i) htonl(i) +#define ntoh16(i) ntohs(i) +#define ntoh32(i) ntohl(i) + #ifdef WORDS_BIGENDIAN -# define hton16(i) ( i ) -# define hton32(i) ( i ) # define hton64(i) ( i ) -# define ntoh16(i) ( i ) -# define ntoh32(i) ( i ) # define ntoh64(i) ( i ) #else -# define hton16(i) U16_AT(&i) -# define hton32(i) U32_AT(&i) # define hton64(i) U64_AT(&i) -# define ntoh16(i) U16_AT(&i) -# define ntoh32(i) U32_AT(&i) # define ntoh64(i) U64_AT(&i) #endif @@ -816,112 +717,23 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) # define ATTR_ALIGN(align) #endif -/* */ -#define VLC_UNUSED(x) (void)(x) - -/* Alignment of critical dynamic data structure - * - * Not all platforms support memalign so we provide a vlc_memalign wrapper - * void *vlc_memalign( size_t align, size_t size, void **pp_orig ) - * *pp_orig is the pointer that has to be freed afterwards. - */ -#if 0 -#ifdef HAVE_POSIX_MEMALIGN -# define vlc_memalign(align,size,pp_orig) \ - ( !posix_memalign( pp_orig, align, size ) ? *(pp_orig) : NULL ) -#endif +#ifdef HAVE_ATTRIBUTE_PACKED +# define ATTR_PACKED __attribute__((__packed__)) #endif -#ifdef HAVE_MEMALIGN - /* Some systems have memalign() but no declaration for it */ - void * memalign( size_t align, size_t size ); -# define vlc_memalign(pp_orig,align,size) \ - ( *(pp_orig) = memalign( align, size ) ) - -#else /* We don't have any choice but to align manually */ -# define vlc_memalign(pp_orig,align,size) \ - (( *(pp_orig) = malloc( size + align - 1 )) \ - ? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \ - & (~(unsigned long)(align-1)) ) \ - : NULL ) - -#endif +/* */ +#define VLC_UNUSED(x) (void)(x) /* Stuff defined in src/extras/libc.c */ -#ifndef HAVE_STRDUP -# define strdup vlc_strdup - VLC_EXPORT( char *, vlc_strdup, ( const char *s ) ); -#elif !defined(__PLUGIN__) -# define vlc_strdup NULL -#endif - -#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) -# define vasprintf vlc_vasprintf - VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) ); -#elif !defined(__PLUGIN__) -# define vlc_vasprintf NULL -#endif - -#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) -# define asprintf vlc_asprintf - VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); -#elif !defined(__PLUGIN__) -# define vlc_asprintf NULL -#endif - -#ifndef HAVE_STRNDUP -# if defined(STRNDUP_IN_GNOME_H) && \ - (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\ - defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main)) - /* Do nothing: gnome.h defines strndup for us */ -# else -# define strndup vlc_strndup - VLC_EXPORT( char *, vlc_strndup, ( const char *s, size_t n ) ); -# endif -#elif !defined(__PLUGIN__) -# define vlc_strndup NULL -#endif - -#ifndef HAVE_STRNLEN -# define strnlen vlc_strnlen - VLC_EXPORT( size_t, vlc_strnlen, ( const char *, size_t ) ); -#elif !defined(__PLUGIN__) -# define vlc_strnlen NULL -#endif - -#ifndef HAVE_STRLCPY -# define strlcpy vlc_strlcpy - VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) ); -#elif !defined(__PLUGIN__) -# define vlc_strlcpy NULL -#endif - -#ifndef HAVE_ATOF -# define atof vlc_atof - VLC_EXPORT( double, vlc_atof, ( const char *nptr ) ); -#elif !defined(__PLUGIN__) -# define vlc_atof NULL -#endif - -#ifndef HAVE_STRTOF -# ifdef HAVE_STRTOD -# define strtof strtod -# endif -#endif - -#ifndef HAVE_ATOLL -# define atoll vlc_atoll - VLC_EXPORT( int64_t, vlc_atoll, ( const char *nptr ) ); -#elif !defined(__PLUGIN__) -# define vlc_atoll NULL -#endif - -#ifndef HAVE_STRTOLL -# define strtoll vlc_strtoll - VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) ); -#elif !defined(__PLUGIN__) -# define vlc_strtoll NULL -#endif +VLC_EXPORT( char *, vlc_strdup, ( const char *s ) ); +VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) ); +VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); +VLC_EXPORT( char *, vlc_strndup, ( const char *s, size_t n ) ); +VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) ); +VLC_EXPORT( double, vlc_atof, ( const char *nptr ) ); +VLC_EXPORT( int64_t, vlc_atoll, ( const char *nptr ) ); +VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) ); +VLC_EXPORT( size_t, vlc_strnlen, ( const char *, size_t ) ); #if defined(SYS_BEOS) \ || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) @@ -929,103 +741,18 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) long long quot; /* Quotient. */ long long rem; /* Remainder. */ } lldiv_t; -# define lldiv vlc_lldiv - VLC_EXPORT( lldiv_t, vlc_lldiv, ( long long numer, long long denom ) ); -#elif !defined(__PLUGIN__) -# define vlc_lldiv NULL -#endif - -#ifndef HAVE_SCANDIR -# define scandir vlc_scandir -# define alphasort vlc_alphasort - struct dirent; - VLC_EXPORT( int, vlc_scandir, ( const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ) ) ); - VLC_EXPORT( int, vlc_alphasort, ( const struct dirent **a, const struct dirent **b ) ); -#elif !defined(__PLUGIN__) -# define vlc_scandir NULL -# define vlc_alphasort NULL #endif +VLC_EXPORT( lldiv_t, vlc_lldiv, ( long long numer, long long denom ) ); -#ifndef HAVE_GETENV -# define getenv vlc_getenv - VLC_EXPORT( char *, vlc_getenv, ( const char *name ) ); -#elif !defined(__PLUGIN__) -# define vlc_getenv NULL -#endif +struct dirent; +VLC_EXPORT( int, vlc_scandir, ( const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ) ) ); +VLC_EXPORT( int, vlc_alphasort, ( const struct dirent **a, const struct dirent **b ) ); -#ifndef HAVE_STRCASECMP -# ifndef HAVE_STRICMP -# define strcasecmp vlc_strcasecmp - VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) ); -# else -# define strcasecmp stricmp -# if !defined(__PLUGIN__) -# define vlc_strcasecmp NULL -# endif -# endif -#elif !defined(__PLUGIN__) -# define vlc_strcasecmp NULL -#endif - -#ifndef HAVE_STRNCASECMP -# ifndef HAVE_STRNICMP -# define strncasecmp vlc_strncasecmp - VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) ); -# else -# define strncasecmp strnicmp -# if !defined(__PLUGIN__) -# define vlc_strncasecmp NULL -# endif -# endif -#elif !defined(__PLUGIN__) -# define vlc_strncasecmp NULL -#endif - -#ifndef HAVE_STRCASESTR -# ifndef HAVE_STRISTR -# define strcasestr vlc_strcasestr - VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) ); -# else -# define strcasestr stristr -# if !defined(__PLUGIN__) -# define vlc_strcasestr NULL -# endif -# endif -#elif !defined(__PLUGIN__) -# define vlc_strcasestr NULL -#endif +VLC_EXPORT( char *, vlc_getenv, ( const char *name ) ); -#ifndef HAVE_DIRENT_H - typedef void DIR; -# ifndef FILENAME_MAX -# define FILENAME_MAX (260) -# endif - struct dirent - { - long d_ino; /* Always zero. */ - unsigned short d_reclen; /* Always zero. */ - unsigned short d_namlen; /* Length of name in d_name. */ - char d_name[FILENAME_MAX]; /* File name. */ - }; -# define opendir vlc_opendir -# define readdir vlc_readdir -# define closedir vlc_closedir -# define rewinddir vlc_rewindir -# define seekdir vlc_seekdir -# define telldir vlc_telldir - VLC_EXPORT( void *, vlc_opendir, ( const char * ) ); - VLC_EXPORT( void *, vlc_readdir, ( void * ) ); - VLC_EXPORT( int, vlc_closedir, ( void * ) ); - VLC_INTERNAL( void, vlc_rewinddir, ( void * ) ); - VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) ); - VLC_INTERNAL( long, vlc_telldir, ( void * ) ); -#else -# if !defined(__PLUGIN__) -# define vlc_opendir NULL -# define vlc_readdir NULL -# define vlc_closedir NULL -# endif -#endif +VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) ); +VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) ); +VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) ); #if defined (WIN32) # include @@ -1033,8 +760,6 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) ); VLC_EXPORT( int, vlc_wclosedir, ( void * ) ); VLC_INTERNAL( void, vlc_rewinddir, ( void * ) ); - VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) ); - VLC_INTERNAL( long, vlc_telldir, ( void * ) ); # define opendir Use_utf8_opendir_or_vlc_wopendir_instead! # define readdir Use_utf8_readdir_or_vlc_wreaddir_instead! # define closedir vlc_wclosedir @@ -1042,52 +767,8 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) # define _wreaddir vlc_wreaddir # define _wclosedir vlc_wclosedir # define rewinddir vlc_rewinddir -# define seekdir vlc_seekdir -# define telldir vlc_telldir -#elif !defined(__PLUGIN__) -# define vlc_wclosedir NULL #endif -/* Format type specifiers for 64 bits numbers */ -#if defined(__CYGWIN32__) || (!defined(WIN32) && !defined(UNDER_CE)) -# if defined(__WORDSIZE) && __WORDSIZE == 64 -# define I64Fd "%ld" -# define I64Fi "%li" -# define I64Fo "%lo" -# define I64Fu "%lu" -# define I64Fx "%lx" -# define I64FX "%lX" -# else -# define I64Fd "%lld" -# define I64Fi "%lli" -# define I64Fo "%llo" -# define I64Fu "%llu" -# define I64Fx "%llx" -# define I64FX "%llX" -# endif -#else -# define I64Fd "%I64d" -# define I64Fi "%I64i" -# define I64Fo "%I64o" -# define I64Fu "%I64u" -# define I64Fx "%I64x" -# define I64FX "%I64X" -#endif /* defined(WIN32)||defined(UNDER_CE) */ - -/* 64 bits integer constant suffix */ -#if defined( __MINGW32__ ) || (!defined(WIN32) && !defined(UNDER_CE)) -# if defined(__WORDSIZE) && __WORDSIZE == 64 -# define I64C(x) x##L -# define UI64C(x) x##UL -# else -# define I64C(x) x##LL -# define UI64C(x) x##ULL -# endif -#else -# define I64C(x) x##i64 -# define UI64C(x) x##ui64 -#endif /* defined(WIN32)||defined(UNDER_CE) */ - #if defined(WIN32) || defined(UNDER_CE) /* win32, cl and icl support */ # if defined( _MSC_VER ) || !defined( __MINGW32__ ) @@ -1148,8 +829,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) # include #endif -VLC_EXPORT( vlc_bool_t, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); -VLC_EXPORT( char **, vlc_parse_cmdline, ( const char *, int * ) ); +VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); /* vlc_wraptext (defined in src/extras/libc.c) */ #define wraptext vlc_wraptext @@ -1181,35 +861,20 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const #define CPU_CAPABILITY_FPU (1<<31) VLC_EXPORT( unsigned, vlc_CPU, ( void ) ); +typedef void *(*vlc_memcpy_t) (void *tgt, const void *src, size_t n); +typedef void *(*vlc_memset_t) (void *tgt, int c, size_t n); + +VLC_EXPORT( void, vlc_fastmem_register, (vlc_memcpy_t cpy, vlc_memset_t set) ); +VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) ); +VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); + /***************************************************************************** * I18n stuff *****************************************************************************/ #ifdef WIN32 - VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); -#endif - -#if defined( ENABLE_NLS ) && \ - (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\ - defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main)||\ - defined(MODULE_NAME_IS_pda)) - /* Declare nothing: gnome.h will do it for us */ -#elif defined( ENABLE_NLS ) -# if defined( HAVE_INCLUDED_GETTEXT ) -# include "libintl.h" -# else -# include -# endif -# undef _ -# ifdef WIN32 -# define _(String) vlc_dgettext (PACKAGE_NAME, String) -# else -# define _(String) dgettext(PACKAGE_NAME, String) -# endif -# define N_(String) (String) -#else -# define _(String) (String) -# define N_(String) (String) +VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); #endif +VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) ); /***************************************************************************** * libvlc features @@ -1225,28 +890,21 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) ); /***************************************************************************** * Additional vlc stuff *****************************************************************************/ -#include "vlc_os_specific.h" #include "vlc_messages.h" #include "vlc_variables.h" #include "vlc_objects.h" -#include "vlc_mtime.h" -#include "vlc_threads_funcs.h" #include "vlc_modules.h" -#include "main.h" +#include "vlc_main.h" #include "vlc_configuration.h" -/** The global thread var for msg stack context - * We store this as a static global variable so we don't need a vlc_object_t - * everywhere. - * This key is created in vlc_threads_init and is therefore ready to use at - * the very beginning of the universe */ -extern vlc_threadvar_t msg_context_global_key; - - #if defined( WIN32 ) || defined( UNDER_CE ) # define DIR_SEP_CHAR '\\' # define DIR_SEP "\\" +# define PATH_SEP_CHAR ';' +# define PATH_SEP ";" #else # define DIR_SEP_CHAR '/' # define DIR_SEP "/" +# define PATH_SEP_CHAR ':' +# define PATH_SEP ":" #endif