Fixed transform filter picture pitches usages.

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 4c241d59dd74d2ae34d607cf544008a2a2b59887..b05c8097812e900282201e9ff388366794b5e177 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -40,7 +40,7 @@ typedef struct
 
 #if !defined(HAVE_GETENV) || \
     !defined(HAVE_USELOCALE)
-# include <stdlib.h> /* NULL */
+# include <stddef.h> /* NULL */
 #endif
 
 #ifndef HAVE_REWIND
@@ -146,6 +146,10 @@ char *getcwd (char *buf, size_t size);
 pid_t getpid (void);
 #endif
 
+#ifndef HAVE_STRTOK_R
+char *strtok_r(char *, const char *, char **);
+#endif
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
@@ -166,7 +170,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)
 {
@@ -186,8 +191,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
 
 #ifdef WIN32
 # include <dirent.h>
-# define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
-# define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
+# define opendir Use_vlc_opendir_or_vlc_wopendir_instead!
+# define readdir Use_vlc_readdir_or_vlc_wreaddir_instead!
 # define closedir vlc_wclosedir
 #endif
 
@@ -200,4 +205,38 @@ 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)
+#endif
+
+#ifndef HAVE_TDESTROY
+# define tdestroy vlc_tdestroy
+#endif
+
 #endif /* !LIBVLC_FIXUPS_H */