Move duplicated '#define closesocket close' into network.h along with

network-related #include #ifdeffery.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2

stream/asf_mmst_streaming.c

@@ -39,12 +39,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#else
-#include <winsock2.h>
-#endif
-
 #ifndef CONFIG_SETLOCALE
 #undef CONFIG_ICONV
 #endif

stream/asf_streaming.c

@@ -8,13 +8,6 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#else
-#include <winsock2.h>
-#endif
-
 #include "url.h"
 #include "http.h"
 #include "libmpdemux/asf.h"

stream/http.c

@@ -11,14 +11,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-#include "http.h"
 #include "url.h"
 #include "mp_msg.h"
 

stream/librtsp/rtsp_session.c

@@ -29,17 +29,6 @@
  */
 
 #include <sys/types.h>
-#include "config.h"
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#else
-#include <winsock2.h>
-#endif
-
-
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -47,10 +36,12 @@
 #include <string.h>
 #include <inttypes.h>
 
+#include "config.h"
 #include "mp_msg.h"
 #include "rtsp.h"
 #include "rtsp_rtp.h"
 #include "rtsp_session.h"
+#include "stream/network.h"
 #include "stream/url.h"
 #include "stream/rtp.h"
 #include "stream/realrtsp/real.h"

stream/network.c

@@ -18,14 +18,6 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 #include "m_config.h"

stream/network.h

@@ -17,6 +17,10 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#define closesocket close
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 
 #include "url.h"

stream/pnm.c

@@ -35,17 +35,9 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <inttypes.h>
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#include <sys/socket.h>
-//#include <netinet/in.h>
-//#include <netdb.h>
-#else
-#include <winsock2.h>
-#endif
 
 #include "libavutil/intreadwrite.h"
-
+#include "network.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 #include "help_mp.h"

stream/rtp.c

@@ -12,17 +12,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <ctype.h>
-#include "config.h"
-#ifndef HAVE_WINSOCK2_H
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
 #include <errno.h>
+#include "config.h"
+#include "network.h"
 #include "stream.h"
 
 /* MPEG-2 TS RTP stack */

stream/stream.c

@@ -13,17 +13,10 @@
 #include <strings.h>
 
 #include "config.h"
-
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#else
-#include <winsock2.h>
-#endif
-
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "osdep/shmem.h"
-
+#include "network.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 

stream/stream_ftp.c

@@ -9,14 +9,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#ifndef HAVE_WINSOCK2_H
-#include <sys/socket.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#endif
 
 #include "mp_msg.h"
+#include "network.h"
 #include "stream.h"
 #include "help_mp.h"
 #include "m_option.h"

stream/stream_netstream.c

@@ -42,15 +42,6 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#ifndef HAVE_WINSOCK2_H
-#define closesocket close
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#else
-#include <winsock2.h>
-#endif
-
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"

stream/stream_rtsp.c

@@ -27,18 +27,10 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <ctype.h>
-#include "config.h"
-#ifndef HAVE_WINSOCK2_H
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
 #include <errno.h>
 
+#include "config.h"
+#include "network.h"
 #include "stream.h"
 #include "tcp.h"
 #include "librtsp/rtsp.h"

stream/tcp.c

@@ -19,18 +19,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-
-#ifndef HAVE_WINSOCK2_H
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
+#include "network.h"
 #include "stream.h"
 #include "tcp.h"
 

stream/udp.c

@@ -31,18 +31,8 @@
 #include <sys/time.h>
 #include <ctype.h>
 
-#ifndef HAVE_WINSOCK2_H
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
 #include "mp_msg.h"
+#include "network.h"
 #include "url.h"
 #include "udp.h"