[vlc-devel] commit: Move vlc_inet_pton, vlc_inet_ntop and vlc_poll to vlc_fixups.h ( Rémi Denis-Courmont )
git version control
git at videolan.org
Tue Dec 15 15:46:47 CET 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec 15 16:42:33 2009 +0200| [2e49a0b392d6ad53cd68b018cf3f0782aff60388] | committer: Rémi Denis-Courmont
Move vlc_inet_pton, vlc_inet_ntop and vlc_poll to vlc_fixups.h
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2e49a0b392d6ad53cd68b018cf3f0782aff60388
---
include/vlc_fixups.h | 30 ++++++++++++++++++++++++++++++
include/vlc_network.h | 28 ----------------------------
2 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 3512029..c14152f 100644
--- 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 f1befae..1fba6be 100644
--- 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));
More information about the vlc-devel
mailing list