Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index b05c8097812e900282201e9ff388366794b5e177..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,6 +145,11 @@ 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
@@ -189,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_vlc_opendir_or_vlc_wopendir_instead!
-# define readdir Use_vlc_readdir_or_vlc_wreaddir_instead!
-# define closedir vlc_wclosedir
-#endif
-
 /* libintl support */
 #define _(str)            vlc_gettext (str)
 #define N_(str)           gettext_noop (str)
@@ -233,10 +234,21 @@ struct pollfd
 };
 
 # 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 */