X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=46da6ae1267cc3a2b73a2b6fbdc75612c4d7e849;hb=3118165aefce584687fd67953e477fbbdf7e1bcb;hp=ca9c667925d844fa3a38c1e68e0464ee48b03c7d;hpb=540c761324ae1034f4aa5a5d45b84907d7720b65;p=vlc diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index ca9c667925..46da6ae126 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -1,8 +1,7 @@ /***************************************************************************** * fixups.h: portability fixups included from config.h ***************************************************************************** - * Copyright © 1998-2007 the VideoLAN project - * $Id$ + * Copyright © 1998-2008 the VideoLAN project * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,97 +23,232 @@ * This file is a collection of portability fixes */ -#ifndef HAVE_STRDUP -# define strdup vlc_strdup +#ifndef LIBVLC_FIXUPS_H +# define LIBVLC_FIXUPS_H 1 + +#if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R) +# include /* time_t */ +#endif + +#ifndef HAVE_LLDIV +typedef struct +{ + long long quot; /* Quotient. */ + long long rem; /* Remainder. */ +} lldiv_t; +#endif + +#if !defined(HAVE_GETENV) || \ + !defined(HAVE_USELOCALE) +# include /* NULL */ +#endif + +#if !defined (HAVE_REWIND) || \ + !defined (HAVE_GETDELIM) +# include /* FILE */ +#endif + +#if !defined (HAVE_STRLCPY) || \ + !defined (HAVE_STRNDUP) || \ + !defined (HAVE_STRNLEN) || \ + !defined (HAVE_GETCWD) +# include /* size_t */ #endif #ifndef HAVE_VASPRINTF -# define vasprintf vlc_vasprintf +# include /* va_list */ #endif -#ifndef HAVE_ASPRINTF -# define asprintf vlc_asprintf +#if !defined (HAVE_GETDELIM) || \ + !defined (HAVE_GETPID) || \ + !defined (HAVE_SWAB) +# include /* ssize_t, pid_t */ #endif -#ifndef HAVE_STRNDUP -# define strndup vlc_strndup +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef HAVE_STRDUP +char *strdup (const char *); +#endif + +#ifndef HAVE_VASPRINTF +int vasprintf (char **, const char *, va_list); +#endif + +#ifndef HAVE_ASPRINTF +int asprintf (char **, const char *, ...); #endif #ifndef HAVE_STRNLEN -# define strnlen vlc_strnlen +size_t strnlen (const char *, size_t); #endif -#ifndef HAVE_STRLCPY -# define strlcpy vlc_strlcpy +#ifndef HAVE_STRNDUP +char *strndup (const char *, size_t); #endif -#ifndef HAVE_ATOF -# define atof vlc_atof +#ifndef HAVE_STRLCPY +size_t strlcpy (char *, const char *, size_t); #endif #ifndef HAVE_STRTOF -# ifdef HAVE_STRTOD -# define strtof( a, b ) ((float)strtod (a, b)) -# endif +float strtof (const char *, char **); #endif -#ifndef HAVE_ATOLL -# define atoll vlc_atoll +#ifndef HAVE_ATOF +double atof (const char *); #endif #ifndef HAVE_STRTOLL -# define strtoll vlc_strtoll +long long int strtoll (const char *, char **, int); #endif -#ifndef HAVE_LLDIV -# define lldiv vlc_lldiv +#ifndef HAVE_STRSEP +char *strsep (char **, const char *); #endif -#ifndef HAVE_SCANDIR -# define scandir vlc_scandir -# define alphasort vlc_alphasort +#ifndef HAVE_ATOLL +long long atoll (const char *); #endif -#ifndef HAVE_GETENV -# define getenv vlc_getenv +#ifndef HAVE_LLDIV +lldiv_t lldiv (long long, long long); #endif #ifndef HAVE_STRCASECMP -# ifndef HAVE_STRICMP -# define strcasecmp vlc_strcasecmp -# else -# define strcasecmp stricmp -# endif +int strcasecmp (const char *, const char *); #endif #ifndef HAVE_STRNCASECMP -# ifndef HAVE_STRNICMP -# define strncasecmp vlc_strncasecmp -# else -# define strncasecmp strnicmp -# endif +int strncasecmp (const char *, const char *, size_t); #endif #ifndef HAVE_STRCASESTR -# ifndef HAVE_STRISTR -# define strcasestr vlc_strcasestr -# else -# define strcasestr stristr -# endif +char *strcasestr (const char *, const char *); +#endif + +#ifndef HAVE_GMTIME_R +struct tm *gmtime_r (const time_t *, struct tm *); #endif #ifndef HAVE_LOCALTIME_R -/* If localtime_r() is not provided, we assume localtime() uses - * thread-specific storage. */ -# include -static struct tm *localtime_r (const time_t *timep, struct tm *result) +struct tm *localtime_r (const time_t *, struct tm *); +#endif + +#ifndef HAVE_REWIND +void rewind (FILE *); +#endif + +#ifndef HAVE_GETCWD +char *getcwd (char *buf, size_t size); +#endif + +#ifndef HAVE_GETDELIM +ssize_t getdelim (char **, size_t *, int, FILE *); +ssize_t getline (char **, size_t *, FILE *); +#endif + +#ifndef HAVE_GETPID +pid_t getpid (void); +#endif + +#ifndef HAVE_STRTOK_R +char *strtok_r(char *, const char *, char **); +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#ifndef HAVE_GETENV +static inline char *getenv (const char *name) { - struct tm *s = localtime (timep); - if (s == NULL) - return NULL; + (void)name; + return NULL; +} +#endif - *result = *s; - return result; +/* Alignment of critical static data structures */ +#ifdef ATTRIBUTE_ALIGNED_MAX +# define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) +#else +# define ATTR_ALIGN(align) +#endif + +#ifndef HAVE_USELOCALE +#define LC_NUMERIC_MASK 0 +#define LC_MESSAGES_MASK 0 +typedef void *locale_t; +static inline locale_t uselocale(locale_t loc) +{ + (void)loc; + return NULL; +} +static inline void freelocale(locale_t loc) +{ + (void)loc; } +static inline locale_t newlocale(int mask, const char * locale, locale_t base) +{ + (void)mask; (void)locale; (void)base; + return NULL; +} +#endif + +/* libintl support */ +#define _(str) vlc_gettext (str) +#define N_(str) gettext_noop (str) +#define gettext_noop(str) (str) + +#ifndef HAVE_SWAB +void swab (const void *, void *, ssize_t); +#endif + +/* Socket stuff */ +#ifndef HAVE_INET_PTON +# define inet_pton vlc_inet_pton +#endif + +#ifndef HAVE_INET_NTOP +# define inet_ntop vlc_inet_ntop +#endif + +#ifndef HAVE_POLL +enum +{ + POLLIN=1, + POLLOUT=2, + POLLPRI=4, + POLLERR=8, // unsupported stub + POLLHUP=16, // unsupported stub + POLLNVAL=32 // unsupported stub +}; + +struct pollfd +{ + int fd; + unsigned events; + unsigned revents; +}; + +# define poll(a, b, c) vlc_poll(a, b, c) +#elif defined (HAVE_MAEMO) +# include +# define poll(a, b, c) vlc_poll(a, b, c) +int vlc_poll (struct pollfd *, unsigned, int); +#endif + +#ifndef HAVE_TDESTROY +# define tdestroy vlc_tdestroy +#endif + +/* Random numbers */ +#ifndef HAVE_NRAND48 +double erand48 (unsigned short subi[3]); +long jrand48 (unsigned short subi[3]); +long nrand48 (unsigned short subi[3]); #endif +#endif /* !LIBVLC_FIXUPS_H */