summaryrefslogtreecommitdiffstats
path: root/stream/pnm.c
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/pnm.c
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/pnm.c')
-rw-r--r--stream/pnm.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/stream/pnm.c b/stream/pnm.c
index d9d9513897..946d9273c2 100644
--- a/stream/pnm.c
+++ b/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"