* 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
*****************************************************************************/
#include <string.h>
#include <stdio.h>
+#include <inttypes.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
-#if defined( HAVE_INTTYPES_H )
-# include <inttypes.h>
-#elif defined( SYS_CYGWIN )
-# include <sys/types.h>
- /* 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 <malloc.h>
# ifndef PATH_MAX
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 ) \
*****************************************************************************/
/* 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;
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 */
* Plug-in stuff
*****************************************************************************/
-#include "vlc_modules_macros.h"
-
#if defined (WIN32) && defined (DLL_EXPORT)
# ifdef __cplusplus
# define VLC_PUBLIC_API extern "C" __declspec(dllexport)
* 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; \
/* 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 \
VLC_GC_MEMBERS
};
-#include <assert.h> /* 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 ++;
};
{
if( !p_gc ) return;
- assert( p_gc->i_gc_refcount > 0 );
-
p_gc->i_gc_refcount -- ;
if( p_gc->i_gc_refcount == 0 )
# define ATTR_ALIGN(align)
#endif
+#ifdef HAVE_ATTRIBUTE_PACKED
+# define ATTR_PACKED __attribute__((__packed__))
+#endif
+
/* */
#define VLC_UNUSED(x) (void)(x)
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 <dirent.h>
VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) );
# define telldir vlc_telldir
#endif
-/* Format type specifiers for 64 bits numbers */
-#define I64Fd "%"PRId64
-#define I64Fi "%"PRIi64
-#define I64Fo "%"PRIo64
-#define I64Fu "%"PRIu64
-#define I64Fx "%"PRIx64
-#define I64FX "%"PRIX64
-
-/* 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__ )
#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
*****************************************************************************/
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 <libintl.h>
-# endif
+# include <libintl.h>
# undef _
# ifdef WIN32
# define _(String) vlc_dgettext (PACKAGE_NAME, String)
#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 "\\"
projects / vlc / blobdiff