diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /stream/cookies.c | |
parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'stream/cookies.c')
-rw-r--r-- | stream/cookies.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/stream/cookies.c b/stream/cookies.c index 3b266a5ca2..e50274a248 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -31,6 +31,8 @@ #include <inttypes.h> #include <limits.h> +#include "osdep/io.h" + #include "cookies.h" #include "http.h" #include "mp_msg.h" |