X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=512b78557e68088bb69bbd8317993df56bf5be4b;hb=ad25fa1c2ae10364abb2e6ac4cbd0990fb87b8bb;hp=983ebd8286bfd4379452260bac97ac90701d34f9;hpb=df3c9a76457b6ad680a08c7ffdbae017d1e37145;p=vlc

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 983ebd8286..512b78557e 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,19 @@ typedef struct
 } lldiv_t;
 #endif
 
+#if !defined(HAVE_GETENV) || \
+    !defined(HAVE_USELOCALE)
+# include <stddef.h> /* NULL */
+#endif
+
 #ifndef HAVE_REWIND
 # 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 +58,10 @@ typedef struct
 # include <stdarg.h> /* va_list */
 #endif
 
+#ifndef HAVE_GETPID
+# include <sys/types.h> /* pid_t */
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -141,6 +138,14 @@ 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_GETPID
+pid_t getpid (void);
+#endif
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
@@ -161,10 +166,22 @@ static inline char *getenv (const char *name)
 #endif
 
 #ifndef HAVE_USELOCALE
+#define LC_NUMERIC_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
@@ -175,15 +192,8 @@ typedef void *locale_t;
 #endif
 
 /* libintl support */
-#define _(str)           gettext(str)
-#define gettext(str)     vlc_gettext (str)
-#define pgettext(ctx,id) vlc_pgettext(ctx,id)
-
-#if defined (ENABLE_NLS)
-# include <libintl.h>
-#endif
-
-#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