X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=e515763c432c0e55a842912b460802ed7a1c8755;hb=160b51a33dc5e96cb91b0efb83ae06bb76f8a759;hp=3512029d9c0051630c0fcbff16c202a4cfa3e185;hpb=714d6155710c201562f2cdd78127c2fc59aebf43;p=vlc diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 3512029d9c..e515763c43 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -1,21 +1,21 @@ /***************************************************************************** - * fixups.h: portability fixups included from config.h + * vlc_fixups.h: portability fixups included from config.h ***************************************************************************** * 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 - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -43,14 +43,15 @@ typedef struct # include /* NULL */ #endif -#ifndef HAVE_REWIND +#if !defined (HAVE_REWIND) || \ + !defined (HAVE_GETDELIM) # include /* FILE */ #endif -#if !defined (HAVE_STRLCPY) || \ +#if !defined (HAVE_POSIX_MEMALIGN) || \ + !defined (HAVE_STRLCPY) || \ !defined (HAVE_STRNDUP) || \ - !defined (HAVE_STRNLEN) || \ - !defined (HAVE_GETCWD) + !defined (HAVE_STRNLEN) # include /* size_t */ #endif @@ -58,24 +59,67 @@ typedef struct # include /* va_list */ #endif -#ifndef HAVE_GETPID -# include /* pid_t */ +#if !defined (HAVE_GETDELIM) || \ + !defined (HAVE_GETPID) || \ + !defined (HAVE_SWAB) +# include /* ssize_t, pid_t */ +#endif + +#if !defined (HAVE_DIRFD) || \ + !defined (HAVE_FDOPENDIR) +# include #endif #ifdef __cplusplus +# define VLC_NOTHROW throw () extern "C" { +#else +# define VLC_NOTHROW #endif -#ifndef HAVE_STRDUP -char *strdup (const char *); +/* stdio.h */ +#ifndef HAVE_ASPRINTF +int asprintf (char **, const char *, ...); +#endif + +#ifndef HAVE_FLOCKFILE +void flockfile (FILE *); +int ftrylockfile (FILE *); +void funlockfile (FILE *); +int getc_unlocked (FILE *); +int getchar_unlocked (void); +int putc_unlocked (int, FILE *); +int putchar_unlocked (int); +#endif + +#ifndef HAVE_GETDELIM +ssize_t getdelim (char **, size_t *, int, FILE *); +ssize_t getline (char **, size_t *, FILE *); +#endif + +#ifndef HAVE_REWIND +void rewind (FILE *); #endif #ifndef HAVE_VASPRINTF int vasprintf (char **, const char *, va_list); #endif -#ifndef HAVE_ASPRINTF -int asprintf (char **, const char *, ...); +/* string.h */ +#ifndef HAVE_STRCASECMP +int strcasecmp (const char *, const char *); +#endif + +#ifndef HAVE_STRCASESTR +char *strcasestr (const char *, const char *); +#endif + +#ifndef HAVE_STRDUP +char *strdup (const char *); +#endif + +#ifndef HAVE_STRVERSCMP +int strverscmp (const char *, const char *); #endif #ifndef HAVE_STRNLEN @@ -90,20 +134,19 @@ char *strndup (const char *, size_t); size_t strlcpy (char *, const char *, size_t); #endif -#ifndef HAVE_STRTOF -float strtof (const char *, char **); +#ifndef HAVE_STRSEP +char *strsep (char **, const char *); #endif -#ifndef HAVE_ATOF -double atof (const char *); +#ifndef HAVE_STRTOK_R +char *strtok_r(char *, const char *, char **); #endif -#ifndef HAVE_STRTOLL -long long int strtoll (const char *, char **, int); +/* stdlib.h */ +#ifndef HAVE_ATOF +#ifndef __ANDROID__ +double atof (const char *); #endif - -#ifndef HAVE_STRSEP -char *strsep (char **, const char *); #endif #ifndef HAVE_ATOLL @@ -114,18 +157,17 @@ long long atoll (const char *); lldiv_t lldiv (long long, long long); #endif -#ifndef HAVE_STRCASECMP -int strcasecmp (const char *, const char *); +#ifndef HAVE_STRTOF +#ifndef __ANDROID__ +float strtof (const char *, char **); #endif - -#ifndef HAVE_STRNCASECMP -int strncasecmp (const char *, const char *, size_t); #endif -#ifndef HAVE_STRCASESTR -char *strcasestr (const char *, const char *); +#ifndef HAVE_STRTOLL +long long int strtoll (const char *, char **, int); #endif +/* time.h */ #ifndef HAVE_GMTIME_R struct tm *gmtime_r (const time_t *, struct tm *); #endif @@ -134,26 +176,29 @@ struct tm *gmtime_r (const time_t *, struct tm *); struct tm *localtime_r (const time_t *, struct tm *); #endif -#ifndef HAVE_REWIND -void rewind (FILE *); +/* unistd.h */ +#ifndef HAVE_GETPID +pid_t getpid (void) VLC_NOTHROW; #endif -#ifndef HAVE_GETCWD -char *getcwd (char *buf, size_t size); +#ifndef HAVE_FSYNC +int fsync (int fd); #endif -#ifndef HAVE_GETPID -pid_t getpid (void); +/* dirent.h */ +#ifndef HAVE_DIRFD +int (dirfd) (DIR *); #endif -#ifndef HAVE_STRTOK_R -char *strtok_r(char *, const char *, char **); +#ifndef HAVE_FDOPENDIR +DIR *fdopendir (int); #endif #ifdef __cplusplus } /* extern "C" */ #endif +/* stdlib.h */ #ifndef HAVE_GETENV static inline char *getenv (const char *name) { @@ -162,15 +207,21 @@ static inline char *getenv (const char *name) } #endif -/* 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) +#ifndef HAVE_SETENV +int setenv (const char *, const char *, int); +int unsetenv (const char *); +#endif + +#ifndef HAVE_POSIX_MEMALIGN +int posix_memalign (void **, size_t, size_t); #endif +/* locale.h */ #ifndef HAVE_USELOCALE -#define LC_NUMERIC_MASK 0 +#define LC_ALL_MASK 0 +#define LC_NUMERIC_MASK 0 +#define LC_MESSAGES_MASK 0 +#define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1) typedef void *locale_t; static inline locale_t uselocale(locale_t loc) { @@ -188,11 +239,16 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) } #endif -#ifdef WIN32 -# include -# define opendir Use_utf8_opendir_or_vlc_wopendir_instead! -# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead! -# define closedir vlc_wclosedir +#if !defined (HAVE_STATIC_ASSERT) +# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) +# define static_assert _Static_assert +#endif + +/* 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 /* libintl support */ @@ -200,13 +256,105 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) #define N_(str) gettext_noop (str) #define gettext_noop(str) (str) +#ifdef __cplusplus +extern "C" { +#endif + #ifndef HAVE_SWAB void swab (const void *, void *, ssize_t); #endif -#ifndef HAVE_TDESTROY -typedef void (*__free_fn_t) (void *__nodep); -void tdestroy (void *vroot, __free_fn_t freefct); +/* Socket stuff */ +#ifndef HAVE_INET_PTON +int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *, char *, int); +#endif + +#ifndef HAVE_STRUCT_POLLFD +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; +}; +#endif +#ifndef HAVE_POLL +struct pollfd; +int poll (struct pollfd *, unsigned, int); +#endif + +#ifndef HAVE_IF_NAMEINDEX +#include +struct if_nameindex +{ + unsigned if_index; + char *if_name; +}; +# ifndef HAVE_IF_NAMETOINDEX +# define if_nametoindex(name) atoi(name) +# endif +# define if_nameindex() (errno = ENOBUFS, NULL) +# define if_freenameindex(list) (void)0 +#endif + +/* search.h */ +#ifndef HAVE_SEARCH_H +typedef struct entry { + char *key; + void *data; +} ENTRY; + +typedef enum { + FIND, ENTER +} ACTION; + +typedef enum { + preorder, + postorder, + endorder, + leaf +} VISIT; + +void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); +void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); +void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); +void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); +void tdestroy( void *root, void (*free_node)(void *nodep) ); +#else // HAVE_SEARCH_H +# ifndef HAVE_TDESTROY +# define tdestroy vlc_tdestroy +# endif +#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 + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#ifdef __OS2__ +# undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */ +#endif + +/* math.h */ + +#ifndef HAVE_NANF +#define nanf(tagp) NAN #endif #endif /* !LIBVLC_FIXUPS_H */