From 41cefe3e1f12b1d74355fad83f9d56091f278c05 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Nov 2017 16:20:24 +0100 Subject: [PATCH] stream_libarchive, osdep: use stubs for POSIX 2008 locale on MinGW --- osdep/io.h | 7 +++++++ stream/stream_libarchive.h | 1 + 2 files changed, 8 insertions(+) diff --git a/osdep/io.h b/osdep/io.h index 55173ea1d7..666928892d 100644 --- a/osdep/io.h +++ b/osdep/io.h @@ -27,6 +27,7 @@ #include #include #include +#include #if HAVE_GLOB_POSIX #include @@ -192,6 +193,12 @@ int msync(void *addr, size_t length, int flags); #define glob(...) mp_glob(__VA_ARGS__) #define globfree(...) mp_globfree(__VA_ARGS__) +// There is not anything that helps with this on Windows. +#define locale_t int +#define newlocale(a, b, c) 1 +#define uselocale(a) 1 +#define freelocale(a) + #else /* __MINGW32__ */ #include diff --git a/stream/stream_libarchive.h b/stream/stream_libarchive.h index 939d6fa65a..56e86a6baa 100644 --- a/stream/stream_libarchive.h +++ b/stream/stream_libarchive.h @@ -1,4 +1,5 @@ #include +#include "osdep/io.h" struct mp_log;