X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fixups.h;h=c14152fbca399bef23c53a2f5421a89e7d43ab6a;hb=77271be3e3ef44bcf777639d61fef615bbfc55bc;hp=bc751879ceb4cbf4b62578bf108472c22773a667;hpb=711f2a1f622eb5e9585d5f548e71c40def96d498;p=vlc diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index bc751879ce..c14152fbca 100644 --- 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 /* NULL */ +#endif + #ifndef HAVE_REWIND # include /* FILE */ #endif @@ -53,6 +58,10 @@ typedef struct # include /* va_list */ #endif +#ifndef HAVE_GETPID +# include /* 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,19 +170,20 @@ static inline char *getenv (const char *name) #endif #ifndef HAVE_USELOCALE +#define LC_NUMERIC_MASK 0 typedef void *locale_t; static inline locale_t uselocale(locale_t loc) { - VLC_UNUSED(loc); + (void)loc; return NULL; } static inline void freelocale(locale_t loc) { - VLC_UNUSED(loc); + (void)loc; } -static inline locale_t newlocale(int mask, const char * locale, locale_t base); +static inline locale_t newlocale(int mask, const char * locale, locale_t base) { - VLC_UNUSED(mask); VLC_UNUSED(locale); VLC_UNUSED(base); + (void)mask; (void)locale; (void)base; return NULL; } #endif @@ -186,4 +204,39 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base); void swab (const void *, void *, ssize_t); #endif +#ifndef HAVE_TDESTROY +typedef void (*__free_fn_t) (void *__nodep); +void tdestroy (void *vroot, __free_fn_t freefct); +#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 */