Remove unused vlc_(send|recv)msg

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 0cd5029afec13a563b8aa47ad3bd02a3634d030c..c3cc983469e3d785983fc0d4512ff725c5678a0e 100644 (file)
--- 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 3e04bb6e6582d7158395705250a1af5b487d2603..af5a6b19e38b87c96edb7247927843c4d24b0783 100644 (file)
--- 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 2c1c80e4679cd6ace4d87397a2cf7bed3ae67869..6b62d902ff6eac1affbdd316685202651d07ce6c 100644 (file)
--- 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 977f62e27de566247317cb4b9a6840d1a1cf69be..dd7f598feb260484c3c2c8ed78b865407686f61c 100644 (file)
--- 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