diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
| commit | ba9b2f1e49732d597009ba514b0132a50562cd10 (patch) | |
| tree | fa05f5feb181823ac9d3b5682a835ff825de6914 /osdep/glob-win.c | |
| parent | e1993d5ad2bdf3dd4c26474aaa2370cbc9c1cd1b (diff) | |
| parent | 7b4ccb3e9f58a0745b58e473ee6e60b381242813 (diff) | |
| download | mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.bz2 mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'osdep/glob-win.c')
| -rw-r--r-- | osdep/glob-win.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/glob-win.c b/osdep/glob-win.c index 30dad4dfc5..cca226ae7a 100644 --- a/osdep/glob-win.c +++ b/osdep/glob-win.c @@ -19,7 +19,7 @@ #include <stdbool.h> #include <string.h> #include "osdep/io.h" -#include "talloc.h" +#include "mpv_talloc.h" static wchar_t *talloc_wcsdup(void *ctx, const wchar_t *wcs) { |