Mercurial > mplayer.hg

diff stream/pnm.c @ 27473:ae5da477539e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move '#define closesocket close' preprocessor directive to a common place and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.
author diego
date Mon, 01 Sep 2008 07:31:57 +0000
parents c0b233cd30ca
children c884d17bd005
line wrap: on
line diff
--- a/stream/pnm.c	Sun Aug 31 13:59:54 2008 +0000
+++ b/stream/pnm.c	Mon Sep 01 07:31:57 2008 +0000
@@ -36,7 +36,6 @@
 #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>
@@ -50,7 +49,7 @@
 #include "libmpdemux/demuxer.h"
 #include "help_mp.h"
 #include "osdep/timer.h"
-
+#include "network.h"
 #include "pnm.h"
 #include "tcp.h"
 //#include "libreal/rmff.h"