net_Close() is a one-liner, so inline it

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 6e9ce3cfbaed5d8c22c27ef37dc792cbd1971634..f2743934f8a652b697218ec7c7058df5f8f06374 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -198,6 +198,12 @@ int poll (struct pollfd *fds, unsigned nfds, int timeout);
 # define net_StopRecv( fd ) (void)0
 #endif
 
+#ifdef WIN32
+# define net_Close( fd ) closesocket ((SOCKET)fd)
+#else
+# define net_Close( fd ) close (fd)
+#endif
+
 /* Portable network names/addresses resolution layer */
 
 /* GAI error codes */

diff --git a/src/network/io.c b/src/network/io.c
index 19b8b299f1006b77e6637015e9083810334cccba..c13949e05447a30297ec3f2d19f73d125cbf08cf 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -265,23 +265,6 @@ int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
 
 
 
-/*****************************************************************************
- * __net_Close:
- *****************************************************************************
- * Close a network handle
- *****************************************************************************/
-void net_Close (int fd)
-{
-#ifdef UNDER_CE
-    CloseHandle ((HANDLE)fd);
-#elif defined (WIN32)
-    closesocket (fd);
-#else
-    (void)close (fd);
-#endif
-}
-
-
 static ssize_t
 net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
                const v_socket_t *const *restrict vsv,