1
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 10:55:27 +01:00

Revert moving closesocket definition and network headers to network.h.

This caused lots of trouble on MinGW, we need a different solution.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-08-31 13:59:54 +00:00
parent 133f1f8872
commit f27f04a53d
14 changed files with 115 additions and 15 deletions

@ -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

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -12,9 +12,17 @@
#include <stdio.h>
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
#include "config.h"
#include "network.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 "stream.h"
/* MPEG-2 TS RTP stack */

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"