diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2014-11-08 17:17:43 +1100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-11-08 10:24:49 +0100 |
| commit | cee0d7f2ada4d09b49ad7b10689198a4d96b7712 (patch) | |
| tree | 181982a1eecc34730fa9e4bd759a974e4e61fb79 | |
| parent | 9f239464da067b8627c7c2bbd85af3f8fcb2f026 (diff) | |
| download | mpv-cee0d7f2ada4d09b49ad7b10689198a4d96b7712.tar.bz2 mpv-cee0d7f2ada4d09b49ad7b10689198a4d96b7712.tar.xz | |
win32: silence some warnings
Signed-off-by: wm4 <wm4@nowhere>
| -rw-r--r-- | options/path.c | 2 | ||||
| -rw-r--r-- | osdep/io.c | 2 |
2 files changed, 3 insertions, 1 deletions
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) |