Mercurial > mplayer.hg

changeset 27472:c0b233cd30ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert moving closesocket definition and network headers to network.h. This caused lots of trouble on MinGW, we need a different solution.
author diego
date Sun, 31 Aug 2008 13:59:54 +0000
parents d9c662edc347
children ae5da477539e
files stream/asf_mmst_streaming.c stream/asf_streaming.c stream/http.c stream/librtsp/rtsp_session.c stream/network.c stream/network.h stream/pnm.c stream/rtp.c stream/stream.c stream/stream_ftp.c stream/stream_netstream.c stream/stream_rtsp.c stream/tcp.c stream/udp.c
diffstat 14 files changed, 115 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/stream/asf_mmst_streaming.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/asf_mmst_streaming.c	Sun Aug 31 13:59:54 2008 +0000
@@ -39,6 +39,12 @@
 #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
--- a/stream/asf_streaming.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/asf_streaming.c	Sun Aug 31 13:59:54 2008 +0000
@@ -8,6 +8,13 @@
 #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"
--- a/stream/http.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/http.c	Sun Aug 31 13:59:54 2008 +0000
@@ -11,6 +11,14 @@
 #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"
 
--- a/stream/librtsp/rtsp_session.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/librtsp/rtsp_session.c	Sun Aug 31 13:59:54 2008 +0000
@@ -29,6 +29,17 @@
  */
 
 #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>
@@ -36,12 +47,10 @@
 #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"
--- a/stream/network.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/network.c	Sun Aug 31 13:59:54 2008 +0000
@@ -18,6 +18,14 @@
 
 #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"
--- a/stream/network.h	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/network.h	Sun Aug 31 13:59:54 2008 +0000
@@ -17,10 +17,6 @@
 #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"
--- a/stream/pnm.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/pnm.c	Sun Aug 31 13:59:54 2008 +0000
@@ -35,9 +35,17 @@
 #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"
--- a/stream/rtp.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/rtp.c	Sun Aug 31 13:59:54 2008 +0000
@@ -12,9 +12,17 @@
 #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 */
--- a/stream/stream.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/stream.c	Sun Aug 31 13:59:54 2008 +0000
@@ -13,10 +13,17 @@
 #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"
 
--- a/stream/stream_ftp.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/stream_ftp.c	Sun Aug 31 13:59:54 2008 +0000
@@ -9,9 +9,14 @@
 #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"
--- a/stream/stream_netstream.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/stream_netstream.c	Sun Aug 31 13:59:54 2008 +0000
@@ -42,6 +42,15 @@
 #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"
--- a/stream/stream_rtsp.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/stream_rtsp.c	Sun Aug 31 13:59:54 2008 +0000
@@ -27,10 +27,18 @@
 #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"
--- a/stream/tcp.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/tcp.c	Sun Aug 31 13:59:54 2008 +0000
@@ -19,7 +19,18 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "network.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 "stream.h"
 #include "tcp.h"
 
--- a/stream/udp.c	Sun Aug 31 13:56:18 2008 +0000
+++ b/stream/udp.c	Sun Aug 31 13:59:54 2008 +0000
@@ -31,8 +31,18 @@
 #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"