# HG changeset patch # User reimar # Date 1117738678 0 # Node ID a4a46131ee7168e68caeab4bf6657889cdcc39ba # Parent 5b57ccc4b6408c80636ba2bd80fe80cf537ea441 Change header order to avoid compile error because of STREAM_SEEK diff -r 5b57ccc4b640 -r a4a46131ee71 libmpdemux/http.c --- a/libmpdemux/http.c Thu Jun 02 16:49:29 2005 +0000 +++ b/libmpdemux/http.c Thu Jun 02 18:57:58 2005 +0000 @@ -4,11 +4,20 @@ * (C) 2001, MPlayer team. */ +#include "config.h" + #include #include #include #include +#ifndef HAVE_WINSOCK2 +#define closesocket close +#else +#include +#include +#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 -#include -#endif - extern mime_struct_t mime_type_table[]; extern int stream_cache_size; diff -r 5b57ccc4b640 -r a4a46131ee71 libmpdemux/pnm.c --- a/libmpdemux/pnm.c Thu Jun 02 16:49:29 2005 +0000 +++ b/libmpdemux/pnm.c Thu Jun 02 18:57:58 2005 +0000 @@ -23,6 +23,8 @@ * based upon code from joschka */ +#include "config.h" + #include #include #include @@ -33,12 +35,6 @@ #include #include #include -#include "stream.h" -#include "demuxer.h" -#include "help_mp.h" - - -#include "config.h" #ifndef HAVE_WINSOCK2 #define closesocket close #include @@ -48,6 +44,10 @@ #include #endif +#include "stream.h" +#include "demuxer.h" +#include "help_mp.h" + #include "pnm.h" //#include "libreal/rmff.h"