X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=ef59010854719bdae3cc438d93610d0c476816b6;hb=46c39c8e9c2e0ec3ba1bf8dc37e6e3e5efb59a08;hp=1341493cb922f75ac2d5c097a678b4a6969186a0;hpb=a660c4fbe421313ff0641bb18b89008dc42afc7b;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index 1341493cb9..ef59010854 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -46,6 +46,7 @@ #include #include +#include #ifdef HAVE_SYS_TYPES_H # include @@ -54,44 +55,6 @@ /***************************************************************************** * Basic types definitions *****************************************************************************/ -#if defined( HAVE_INTTYPES_H ) -# include -#elif defined( SYS_CYGWIN ) - /* 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 - -/* 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 - #if defined( WIN32 ) || defined( UNDER_CE ) # include # ifndef PATH_MAX @@ -159,7 +122,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; @@ -168,8 +130,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 */ @@ -431,8 +391,6 @@ 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 extern "C" __declspec(dllexport) @@ -485,6 +443,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; @@ -499,7 +458,6 @@ 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; \ @@ -523,8 +481,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; 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; \ @@ -535,7 +491,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 \ @@ -810,32 +766,6 @@ 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 ) ); -#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 * ) ); -#endif - #if defined (WIN32) # include VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) ); @@ -948,6 +878,13 @@ 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 *****************************************************************************/ @@ -991,10 +928,8 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) ); #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" #if defined( WIN32 ) || defined( UNDER_CE )