old contribs: enable ebml/matroska for android, disable live555

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 1e4336c04668078ebbd94b687d3cd2955e7cb4e6..9ad95f55376d6c540c72306d555be8311cd78013 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -50,8 +50,7 @@ typedef struct
 
 #if !defined (HAVE_STRLCPY) || \
     !defined (HAVE_STRNDUP) || \
-    !defined (HAVE_STRNLEN) || \
-    !defined (HAVE_GETCWD)
+    !defined (HAVE_STRNLEN)
 # include <stddef.h> /* size_t */
 #endif
 
@@ -78,6 +77,16 @@ extern "C" {
 int asprintf (char **, const char *, ...);
 #endif
 
+#ifndef HAVE_FLOCKFILE
+void flockfile (FILE *);
+int ftrylockfile (FILE *);
+void funlockfile (FILE *);
+int getc_unlocked (FILE *);
+int getchar_unlocked (void);
+int putc_unlocked (int, FILE *);
+int putchar_unlocked (int);
+#endif
+
 #ifndef HAVE_GETDELIM
 ssize_t getdelim (char **, size_t *, int, FILE *);
 ssize_t getline (char **, size_t *, FILE *);
@@ -163,14 +172,14 @@ struct tm *localtime_r (const time_t *, struct tm *);
 #endif
 
 /* unistd.h */
-#ifndef HAVE_GETCWD
-char *getcwd (char *buf, size_t size);
-#endif
-
 #ifndef HAVE_GETPID
 pid_t getpid (void);
 #endif
 
+#ifndef HAVE_FSYNC
+int fsync (int fd);
+#endif
+
 /* dirent.h */
 #ifndef HAVE_DIRFD
 #ifdef __APPLE__
@@ -243,7 +252,7 @@ void swab (const void *, void *, ssize_t);
 # define inet_ntop vlc_inet_ntop
 #endif
 
-#ifndef HAVE_POLL
+#ifndef HAVE_STRUCT_POLLFD
 enum
 {
     POLLIN=1,
@@ -260,7 +269,8 @@ struct pollfd
     unsigned events;
     unsigned revents;
 };
-
+#endif
+#ifndef HAVE_POLL
 # define poll(a, b, c) vlc_poll(a, b, c)
 #elif defined (HAVE_MAEMO)
 # include <poll.h>
@@ -268,6 +278,20 @@ struct pollfd
 int vlc_poll (struct pollfd *, unsigned, int);
 #endif
 
+#ifndef HAVE_IF_NAMEINDEX
+#include <errno.h>
+struct if_nameindex
+{
+    unsigned if_index;
+    char    *if_name;
+};
+# ifndef HAVE_IF_NAMETOINDEX
+#  define if_nametoindex(name)   atoi(name)
+# endif
+# define if_nameindex()         (errno = ENOBUFS, NULL)
+# define if_freenameindex(list) (void)0
+#endif
+
 /* search.h */
 #ifndef HAVE_SEARCH_H
 typedef struct entry {