X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=a223384b8d4555aab2d0d6bda1620f488ea87eb0;hb=7158aaea585c198a4e536af1be9f3cbbe2e62f74;hp=a02eeceb974186caf7261f71076dd1c732fd53ff;hpb=be531987f668b1cea7aaa103638bffc97492feea;p=vlc

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index a02eeceb97..a223384b8d 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -38,14 +38,19 @@ typedef struct
 } lldiv_t;
 #endif
 
-#ifndef HAVE_REWIND
+#if !defined(HAVE_GETENV) || \
+    !defined(HAVE_USELOCALE)
+# include <stddef.h> /* NULL */
+#endif
+
+#if !defined (HAVE_REWIND) || \
+    !defined (HAVE_GETDELIM)
 # include <stdio.h> /* FILE */
 #endif
 
 #if !defined (HAVE_STRLCPY) || \
     !defined (HAVE_STRNDUP) || \
-    !defined (HAVE_STRNLEN) || \
-    !defined (HAVE_GETCWD)
+    !defined (HAVE_STRNLEN)
 # include <stddef.h> /* size_t */
 #endif
 
@@ -53,20 +58,63 @@ typedef struct
 # include <stdarg.h> /* va_list */
 #endif
 
+#if !defined (HAVE_GETDELIM) || \
+    !defined (HAVE_GETPID)   || \
+    !defined (HAVE_SWAB)
+# include <sys/types.h> /* ssize_t, pid_t */
+#endif
+
+#ifndef HAVE_DIRFD
+# include <dirent.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #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_STRNCASECMP
+int strncasecmp (const char *, const char *, size_t);
 #endif
 
 #ifndef HAVE_STRNLEN
@@ -81,20 +129,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
@@ -105,18 +152,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
@@ -125,18 +171,28 @@ 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);
 #endif
 
-#ifndef HAVE_GETCWD
-char *getcwd (char *buf, size_t size);
+#ifndef HAVE_FSYNC
+int fsync (int fd);
+#endif
+
+/* dirent.h */
+#ifndef HAVE_DIRFD
+#ifdef __APPLE__
+#undef dirfd
+#endif
+int dirfd (DIR *);
 #endif
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 
+/* stdlib.h */
 #ifndef HAVE_GETENV
 static inline char *getenv (const char *name)
 {
@@ -145,25 +201,37 @@ 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
 
+/* locale.h */
 #ifndef HAVE_USELOCALE
+#define LC_NUMERIC_MASK  0
+#define LC_MESSAGES_MASK 0
 typedef void *locale_t;
-# define newlocale( a, b, c ) ((locale_t)0)
-# define uselocale( a ) ((locale_t)0)
-# define freelocale( a ) (void)0
+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
 
-#ifdef WIN32
-# include <dirent.h>
-# define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
-# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
-# define closedir vlc_wclosedir
+/* 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 */
@@ -175,4 +243,104 @@ typedef void *locale_t;
 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 <poll.h>
+# define poll(a, b, c) vlc_poll(a, b, c)
+int vlc_poll (struct pollfd *, unsigned, int);
+#endif
+
+#ifndef HAVE_IF_NAMEINDEX
+#include <errno.h>
+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 __ANDROID__
+# undef __linux__
+# ifndef __cplusplus
+#  define __cplusplus 0
+# endif
+# include <pthread.h>
+# if __cplusplus == 0
+#  undef __cplusplus
+# endif
+char *tempnam(const char *, const char *);
+#endif // ANDROID
+
+#ifdef __OS2__
+# undef HAVE_FORK   /* Implementation of fork() is imperfect on OS/2 */
+#endif
+
 #endif /* !LIBVLC_FIXUPS_H */