Use var_InheritString for --decklink-video-connection.

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 512b78557e68088bb69bbd8317993df56bf5be4b..46da6ae1267cc3a2b73a2b6fbdc75612c4d7e849 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -43,7 +43,8 @@ typedef struct
 # include <stddef.h> /* NULL */
 #endif
 
-#ifndef HAVE_REWIND
+#if !defined (HAVE_REWIND) || \
+    !defined (HAVE_GETDELIM)
 # include <stdio.h> /* FILE */
 #endif
 
@@ -58,8 +59,10 @@ typedef struct
 # include <stdarg.h> /* va_list */
 #endif
 
-#ifndef HAVE_GETPID
-# include <sys/types.h> /* pid_t */
+#if !defined (HAVE_GETDELIM) || \
+    !defined (HAVE_GETPID)   || \
+    !defined (HAVE_SWAB)
+# include <sys/types.h> /* ssize_t, pid_t */
 #endif
 
 #ifdef __cplusplus
@@ -142,10 +145,19 @@ void rewind (FILE *);
 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
@@ -166,7 +178,8 @@ static inline char *getenv (const char *name)
 #endif
 
 #ifndef HAVE_USELOCALE
-#define LC_NUMERIC_MASK 0
+#define LC_NUMERIC_MASK  0
+#define LC_MESSAGES_MASK 0
 typedef void *locale_t;
 static inline locale_t uselocale(locale_t loc)
 {
@@ -184,13 +197,6 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 }
 #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
-#endif
-
 /* libintl support */
 #define _(str)            vlc_gettext (str)
 #define N_(str)           gettext_noop (str)
@@ -200,4 +206,49 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 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 */