From 15c3e9e9e742ad592d219c820d9dc31b973b02cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 12 Apr 2009 12:51:21 +0300 Subject: [PATCH] Remove unused vlc_(send|recv)msg --- include/vlc_network.h | 6 ------ src/libvlccore.sym | 2 -- src/network/io.c | 15 --------------- src/network/winsock.c | 2 ++ 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/include/vlc_network.h b/include/vlc_network.h index 0cd5029afe..c3cc983469 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -60,9 +60,6 @@ struct msghdr int msg_flags; }; -#define sendmsg vlc_sendmsg -#define recvmsg vlc_recvmsg - # ifndef IPV6_V6ONLY # define IPV6_V6ONLY 27 # endif @@ -80,9 +77,6 @@ struct msghdr # define net_errno errno #endif -VLC_EXPORT( ssize_t, vlc_sendmsg, ( int, struct msghdr *, int ) ); -VLC_EXPORT( ssize_t, vlc_recvmsg, ( int, struct msghdr *, int ) ); - # ifdef __cplusplus extern "C" { # endif diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 3e04bb6e65..af5a6b19e3 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -475,7 +475,6 @@ __vlc_object_set_destructor vlc_plugin_set vlc_poll vlc_rand_bytes -vlc_recvmsg vlc_release vlc_restorecancel vlc_savecancel @@ -484,7 +483,6 @@ vlc_sd_GetNames vlc_sdp_Start vlc_sd_Start vlc_sd_Stop -vlc_sendmsg vlc_testcancel vlc_thread_create __vlc_thread_join diff --git a/src/network/io.c b/src/network/io.c index 2c1c80e467..6b62d902ff 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -564,18 +564,3 @@ ssize_t __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, return i_ret; } - -#ifdef WIN32 - /* vlc_sendmsg, vlc_recvmsg Defined in winsock.c */ -#else /* !WIN32 */ -ssize_t vlc_sendmsg (int s, struct msghdr *hdr, int flags) -{ - return sendmsg (s, hdr, flags); -} - -ssize_t vlc_recvmsg (int s, struct msghdr *hdr, int flags) -{ - return recvmsg (s, hdr, flags); -} -#endif /* WIN32 */ - diff --git a/src/network/winsock.c b/src/network/winsock.c index 977f62e27d..dd7f598feb 100644 --- a/src/network/winsock.c +++ b/src/network/winsock.c @@ -148,6 +148,7 @@ const char *net_strerror( int value ) return "Unknown network stack error"; } +#if 0 ssize_t vlc_sendmsg (int s, struct msghdr *hdr, int flags) { /* WSASendMsg would be more straightforward, and would support ancilliary @@ -208,3 +209,4 @@ ssize_t vlc_recvmsg (int s, struct msghdr *hdr, int flags) #endif return -1; } +#endif -- 2.39.2