Commit 2e49a0b3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move vlc_inet_pton, vlc_inet_ntop and vlc_poll to vlc_fixups.h

parent 6ada759b
...@@ -209,4 +209,34 @@ typedef void (*__free_fn_t) (void *__nodep); ...@@ -209,4 +209,34 @@ typedef void (*__free_fn_t) (void *__nodep);
void tdestroy (void *vroot, __free_fn_t freefct); void tdestroy (void *vroot, __free_fn_t freefct);
#endif #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 */ #endif /* !LIBVLC_FIXUPS_H */
...@@ -151,37 +151,9 @@ VLC_EXPORT( ssize_t, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_ ...@@ -151,37 +151,9 @@ VLC_EXPORT( ssize_t, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_
VLC_EXPORT( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) ); VLC_EXPORT( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) );
/* Don't go to an extra call layer if we have the symbol */
#ifndef HAVE_INET_PTON
#define inet_pton vlc_inet_pton
#endif
#ifndef HAVE_INET_NTOP
#define inet_ntop vlc_inet_ntop
#endif
VLC_EXPORT (int, vlc_inet_pton, (int af, const char *src, void *dst) ); VLC_EXPORT (int, vlc_inet_pton, (int af, const char *src, void *dst) );
VLC_EXPORT (const char *, vlc_inet_ntop, (int af, const void *src, VLC_EXPORT (const char *, vlc_inet_ntop, (int af, const void *src,
char *dst, socklen_t cnt) ); char *dst, socklen_t cnt) );
#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;
int events;
int revents;
};
# define poll(a, b, c) vlc_poll(a, b, c)
#endif
struct pollfd; struct pollfd;
VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout)); VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment