From: Rémi Denis-Courmont <rem@videolan.org>
Date: Mon, 26 Feb 2007 16:42:53 +0000 (+0000)
Subject: net_Close() is a one-liner, so inline it
X-Git-Tag: 0.9.0-test0~8412
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=42388a77bdcf23357696f033a81d11485cd7c00d;p=vlc

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

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 6e9ce3cfba..f2743934f8 100644
--- 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 19b8b299f1..c13949e054 100644
--- 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,