diff options
| author |  reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-02 18:57:58 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-06-02 18:57:58 +0000 |
| commit | 5ee6c9882d1d5ef4129d695c25bb694ba7cdf954 (patch) | |
| tree | edd6f52e7f696afd1ed372b2c739deaaff5f6f87 | |
| parent | 72ea92819489fae06e73b2cd2196440c90a91470 (diff) | |
Change header order to avoid compile error because of STREAM_SEEK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15615 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/http.c | 16 | ||||
| -rw-r--r-- | libmpdemux/pnm.c | 12 |
2 files changed, 15 insertions, 13 deletions
diff --git a/libmpdemux/http.c b/libmpdemux/http.c index 58a79eccd4..35f23e0c00 100644 --- a/libmpdemux/http.c +++ b/libmpdemux/http.c @@ -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; diff --git a/libmpdemux/pnm.c b/libmpdemux/pnm.c index 460e4f85fc..ac0a9bf5c0 100644 --- a/libmpdemux/pnm.c +++ b/libmpdemux/pnm.c @@ -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" |