diff options
author | wm4 <wm4@nowhere> | 2013-12-17 02:18:16 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-17 02:18:16 +0100 |
commit | 73a5417950a2d21a397597c05521725f3d125993 (patch) | |
tree | 46fc5856d7774a39d449bbbd80405d0d2ba92fd9 /osdep/io.c | |
parent | eb15151705d47d23da844449126cc6b4879f110e (diff) | |
download | mpv-73a5417950a2d21a397597c05521725f3d125993.tar.bz2 mpv-73a5417950a2d21a397597c05521725f3d125993.tar.xz |
Merge mp_talloc.h into ta/ta_talloc.h
Diffstat (limited to 'osdep/io.c')
-rw-r--r-- | osdep/io.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/osdep/io.c b/osdep/io.c index e816cc714d..19f0be1108 100644 --- a/osdep/io.c +++ b/osdep/io.c @@ -20,6 +20,8 @@ #include <unistd.h> +#include "talloc.h" + #include "config.h" #include "osdep/io.h" @@ -46,8 +48,6 @@ bool mp_set_cloexec(int fd) #include <stdio.h> #include <stddef.h> -#include "talloc.h" - //copied and modified from libav //http://git.libav.org/?p=libav.git;a=blob;f=libavformat/os_support.c;h=a0fcd6c9ba2be4b0dbcc476f6c53587345cc1152;hb=HEADl30 @@ -79,8 +79,6 @@ char *mp_to_utf8(void *talloc_ctx, const wchar_t *s) #include <fcntl.h> #include <pthread.h> -#include "mpvcore/mp_talloc.h" - //http://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=ade3f10ce2fc030e32e375a85fbd06c26d43a433#l161 static char** win32_argv_utf8; |