1.0.0-pre2: RC1 shouldn't be far away, is it?

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 25d5f10d349c91f8c32b16aacdcab65ad9d26288..ead019dcb93b44981b4e84c6e2acdc530c09d389 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -39,12 +39,41 @@
 # error Window CE support for *printf needs fixing.
 #endif
 
+#if !defined (HAVE_GMTIME_R) || !defined (HAVE_LOCALTIME_R)
+# include <time.h> /* time_t */
+#endif
+
+#ifndef HAVE_LLDIV
+typedef struct
+{
+    long long quot; /* Quotient. */
+    long long rem;  /* Remainder. */
+} lldiv_t;
+#endif
+
+#ifndef HAVE_REWIND
+# include <stdio.h> /* FILE */
+#endif
+
+#if !defined (HAVE_STRLCPY) || \
+    !defined (HAVE_STRNDUP) || \
+    !defined (HAVE_STRNLEN)
+# include <stddef.h> /* size_t */
+#endif
+
+#ifndef HAVE_VASPRINTF
+# include <stdarg.h> /* va_list */
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef HAVE_STRDUP
 char *strdup (const char *);
 #endif
 
 #ifndef HAVE_VASPRINTF
-# include <stdarg.h>
 int vasprintf (char **, const char *, va_list);
 #endif
 
@@ -53,17 +82,14 @@ int asprintf (char **, const char *, ...);
 #endif
 
 #ifndef HAVE_STRNLEN
-# include <stddef.h>
 size_t strnlen (const char *, size_t);
 #endif
 
 #ifndef HAVE_STRNDUP
-# include <stddef.h>
 char *strndup (const char *, size_t);
 #endif
 
 #ifndef HAVE_STRLCPY
-# include <stddef.h>
 size_t strlcpy (char *, const char *, size_t);
 #endif
 
@@ -88,85 +114,42 @@ long long atoll (const char *);
 #endif
 
 #ifndef HAVE_LLDIV
-typedef struct {
-    long long quot; /* Quotient. */
-    long long rem;  /* Remainder. */
-} lldiv_t;
-
 lldiv_t lldiv (long long, long long);
 #endif
 
-#ifndef HAVE_GETENV
-static inline char *getenv (const char *name)
-{
-    (void)name;
-    return NULL;
-}
-#endif
-
 #ifndef HAVE_STRCASECMP
-# ifndef HAVE_STRICMP
-#  include <ctype.h>
-static inline int strcasecmp (const char *s1, const char *s2)
-{
-    for (size_t i = 0;; i++)
-    {
-        int d = tolower (s1[i]) - tolower (s2[i]);
-        if (d || !s1[i]) return d;
-    }
-    return 0;
-}
-# else
-#  define strcasecmp stricmp
-# endif
+int strcasecmp (const char *, const char *);
 #endif
 
 #ifndef HAVE_STRNCASECMP
-# ifndef HAVE_STRNICMP
-#  include <ctype.h>
-static inline int strncasecmp (const char *s1, const char *s2, size_t n)
-{
-    for (size_t i = 0; i < n; i++)
-    {
-        int d = tolower (s1[i]) - tolower (s2[i]);
-        if (d || !s1[i]) return d;
-    }
-    return 0;
-}
-# 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 <time.h>
-static inline struct tm *localtime_r (const time_t *timep, struct tm *result)
-{
-    struct tm *s = localtime (timep);
-    if (s == NULL)
-        return NULL;
+struct tm *localtime_r (const time_t *, struct tm *);
+#endif
 
-    *result = *s;
-    return result;
-}
-static inline struct tm *gmtime_r (const time_t *timep, struct tm *result)
-{
-    struct tm *s = gmtime (timep);
-    if (s == NULL)
-        return NULL;
+#ifndef HAVE_REWIND
+void rewind (FILE *);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
 
-    *result = *s;
-    return result;
+#ifndef HAVE_GETENV
+static inline char *getenv (const char *name)
+{
+    (void)name;
+    return NULL;
 }
 #endif
 
@@ -192,21 +175,15 @@ typedef void *locale_t;
 #endif
 
 /* libintl support */
-#define _(str) vlc_gettext (str)
-
-#if defined (ENABLE_NLS)
-# include <libintl.h>
-#endif
+#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 gettext_noop(str) (str)
 
-#ifdef UNDER_CE
-static inline void rewind ( FILE *stream )
-{
-    fseek(stream, 0L, SEEK_SET);
-    clearerr(stream);
-}
+#ifndef HAVE_SWAB
+void swab (const void *, void *, ssize_t);
 #endif
 
 #endif /* !LIBVLC_FIXUPS_H */