Mercurial > mplayer.hg
changeset 15614:a4a46131ee71
Change header order to avoid compile error because of STREAM_SEEK
| author | reimar |
|---|---|
| date | Thu, 02 Jun 2005 18:57:58 +0000 |
| parents | 5b57ccc4b640 |
| children | 9cac673752f6 |
| files | libmpdemux/http.c libmpdemux/pnm.c |
| diffstat | 2 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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;
--- 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 <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"