X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_fixups.h;h=25102fa3f6c92dfdf1eda4ebf73d6e703846ab73;hb=c75fafe4ec348154a6e07c324dbe62c1c23a7149;hp=ef6fae285db437ea66889844e68d0d0b9725e1f9;hpb=4e29ccba6220630f8cc34b9aa64c787b84613f80;p=vlc diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index ef6fae285d..25102fa3f6 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -43,7 +43,8 @@ typedef struct # include /* NULL */ #endif -#ifndef HAVE_REWIND +#if !defined (HAVE_REWIND) || \ + !defined (HAVE_GETDELIM) # include /* FILE */ #endif @@ -58,8 +59,10 @@ typedef struct # include /* va_list */ #endif -#ifndef HAVE_GETPID -# include /* pid_t */ +#if !defined (HAVE_GETDELIM) || \ + !defined (HAVE_GETPID) || \ + !defined (HAVE_SWAB) +# include /* 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 @@ -191,8 +199,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) #ifdef WIN32 # include -# 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 @@ -233,10 +241,21 @@ struct pollfd }; # define poll(a, b, c) vlc_poll(a, b, c) +#elif defined (HAVE_MAEMO) +# include +# 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 */