X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=46da6ae1267cc3a2b73a2b6fbdc75612c4d7e849;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=ead019dcb93b44981b4e84c6e2acdc530c09d389;hpb=1e9c9c83889e2b93dde605432fd67a04fdbfd7d5;p=vlc

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index ead019dcb9..46da6ae126 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -26,19 +26,6 @@
 #ifndef LIBVLC_FIXUPS_H
 # define LIBVLC_FIXUPS_H 1
 
-#ifdef __MINGW32_VERSION
-# if __MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION < 14
-#  error This mingw-runtime is too old, it has a broken vsnprintf
-# endif
-/* mingw-runtime provides the whole printf family in a c99 compliant way. */
-/* the way to enable this is to define __USE_MINGW_ANSI_STDIO, or something
- * such as _ISOC99_SOURCE; the former is done by configure.ac */
-/* This isn't done here, since some modules don't include config.h and
- * therefore this as the first include file */
-#elif defined UNDER_CE
-# error Window CE support for *printf needs fixing.
-#endif
-
 #if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R)
 # include <time.h> /* time_t */
 #endif
@@ -51,13 +38,20 @@ 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_STRNLEN) || \
+    !defined (HAVE_GETCWD)
 # include <stddef.h> /* size_t */
 #endif
 
@@ -65,6 +59,12 @@ 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
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -141,6 +141,23 @@ struct tm *localtime_r (const time_t *, struct tm *);
 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
@@ -161,29 +178,77 @@ static inline char *getenv (const char *name)
 #endif
 
 #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
-#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
+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)           gettext(str)
-#define gettext(str)     vlc_gettext (str)
-#define pgettext(ctx,id) vlc_pgettext(ctx,id)
-
-#define N_(str) gettext_noop (str)
+#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 <poll.h>
+# 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 */