[MPlayer-cvslog] CVS: main/libmpdemux http.c, 1.21, 1.22 pnm.c, 1.13, 1.14

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv23598/libmpdemux

Modified Files:
	http.c pnm.c 
Log Message:
Change header order to avoid compile error because of STREAM_SEEK


Index: http.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/http.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http.c	29 May 2005 12:53:59 -0000	1.21
+++ http.c	2 Jun 2005 18:57:58 -0000	1.22
@@ -4,11 +4,20 @@
  * (C) 2001, MPlayer team.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#ifndef HAVE_WINSOCK2
+#define closesocket close
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
 #include "http.h"
 #include "url.h"
 #include "mp_msg.h"
@@ -18,13 +27,6 @@
 #include "network.h"
 #include "help_mp.h"
 
-#ifndef HAVE_WINSOCK2
-#define closesocket close
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
 
 extern mime_struct_t mime_type_table[];
 extern int stream_cache_size;

Index: pnm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/pnm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pnm.c	29 May 2005 12:53:59 -0000	1.13
+++ pnm.c	2 Jun 2005 18:57:58 -0000	1.14
@@ -23,6 +23,8 @@
  * based upon code from joschka
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
@@ -33,12 +35,6 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <inttypes.h>
-#include "stream.h"
-#include "demuxer.h"
-#include "help_mp.h"
-
-
-#include "config.h"
 #ifndef HAVE_WINSOCK2
 #define closesocket close
 #include <sys/socket.h>
@@ -48,6 +44,10 @@
 #include <winsock2.h>
 #endif
 
+#include "stream.h"
+#include "demuxer.h"
+#include "help_mp.h"
+
 #include "pnm.h"
 //#include "libreal/rmff.h"