Revert "compat: implement tdestroy (GNU extension not available on OpenBSD)."

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index a02eeceb974186caf7261f71076dd1c732fd53ff..7f85f6ea2e36fd578b506502c93a5c08a032b36b 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -38,6 +38,11 @@ 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
@@ -53,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
@@ -133,6 +142,14 @@ void rewind (FILE *);
 char *getcwd (char *buf, size_t size);
 #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
@@ -153,10 +170,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,4 +204,34 @@ typedef void *locale_t;
 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
+
 #endif /* !LIBVLC_FIXUPS_H */