Move vlc_inet_pton, vlc_inet_ntop and vlc_poll to vlc_fixups.h

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 3512029d9c0051630c0fcbff16c202a4cfa3e185..c14152fbca399bef23c53a2f5421a89e7d43ab6a 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -209,4 +209,34 @@ 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 */

diff --git a/include/vlc_network.h b/include/vlc_network.h
index f1befae6a42c7fba2853b2920e908373ec5185a0..1fba6bec32252daa72c0275cc12a57fe446fe605 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -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 ) );
 
 
-/* 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 (const char *, vlc_inet_ntop, (int af, const void *src,
                                           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;
 VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout));