* 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_STDINT_H
-# undef HAVE_INTTYPES_H
-#elif defined( _MSC_VER )
+#if defined( _MSC_VER )
# pragma warning( disable : 4244 )
#endif
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
-#if defined( HAVE_STDINT_H )
-# include <stdint.h>
-#elif defined( HAVE_INTTYPES_H )
+#if defined( HAVE_INTTYPES_H )
# include <inttypes.h>
#elif defined( SYS_CYGWIN )
# include <sys/types.h>
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_MAX (9223372036854775807LL)
#endif
-/* ptrdiff_t definition */
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#else
-# include <malloc.h>
-# 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 <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 ) \
*/
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*/
#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_PRIVATE_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
# 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_PRIVATE_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
# 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
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; \
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 */ \
# define ATTR_ALIGN(align)
#endif
+#ifdef HAVE_ATTRIBUTE_PACKED
+# define ATTR_PACKED __attribute__((__packed__))
+#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))
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
+VLC_EXPORT( lldiv_t, vlc_lldiv, ( long long numer, long long denom ) );
-#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
-
-#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
+VLC_EXPORT( char *, vlc_getenv, ( const char *name ) );
-#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( 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;
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
#if defined (WIN32)
# 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) */
+#define I64C(x) INT64_C(x)
#if defined(WIN32) || defined(UNDER_CE)
/* win32, cl and icl support */
# include <tchar.h>
#endif
-VLC_EXPORT( vlc_bool_t, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
+VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
VLC_EXPORT( char **, vlc_parse_cmdline, ( const char *, int * ) );
/* vlc_wraptext (defined in src/extras/libc.c) */
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)
/*****************************************************************************
* Additional vlc stuff
*****************************************************************************/
-#include "vlc_os_specific.h"
#include "vlc_messages.h"
#include "vlc_variables.h"
#include "vlc_objects.h"
#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