summaryrefslogtreecommitdiffstats
path: root/stream/librtsp
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-29 22:55:39 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-29 22:55:39 +0000
commitc152b07e661cbc274cd4979e6b5e053a64656476 (patch)
tree095a8e6af4d608af6c36496227665b14ac6d4921 /stream/librtsp
parent2a90e559a97e6a77f2caaf8975f4333c2b8766f3 (diff)
downloadmpv-c152b07e661cbc274cd4979e6b5e053a64656476.tar.bz2
mpv-c152b07e661cbc274cd4979e6b5e053a64656476.tar.xz
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
Diffstat (limited to 'stream/librtsp')
-rw-r--r--stream/librtsp/rtsp_session.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c
index 5e897ba777..022aebf183 100644
--- a/stream/librtsp/rtsp_session.c
+++ b/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"