From cee0d7f2ada4d09b49ad7b10689198a4d96b7712 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Sat, 8 Nov 2014 17:17:43 +1100 Subject: win32: silence some warnings Signed-off-by: wm4 --- options/path.c | 2 ++ osdep/io.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/options/path.c b/options/path.c index 8a7873ded2..80c461cda8 100644 --- a/options/path.c +++ b/options/path.c @@ -44,6 +44,7 @@ #include "osdep/io.h" #include "osdep/path.h" +#if !defined(_WIN32) || defined(__CYGWIN__) static int mp_add_xdg_config_dirs(struct mpv_global *global, char **dirs, int i) { void *talloc_ctx = dirs; @@ -77,6 +78,7 @@ static int mp_add_xdg_config_dirs(struct mpv_global *global, char **dirs, int i) return i; } +#endif // Return NULL-terminated array of config directories, from highest to lowest // priority diff --git a/osdep/io.c b/osdep/io.c index 00715288a9..7c46dd47ab 100644 --- a/osdep/io.c +++ b/osdep/io.c @@ -65,7 +65,7 @@ int mp_make_cloexec_pipe(int pipes[2]) #ifdef __MINGW32__ int mp_make_wakeup_pipe(int pipes[2]) { - mp_make_cloexec_pipe(pipes); + return mp_make_cloexec_pipe(pipes); } #else // create a pipe, and set it to non-blocking (and also set FD_CLOEXEC) -- cgit v1.2.3