diff options
author | Tom Yan <tom.ty89@gmail.com> | 2018-07-21 16:39:11 +0800 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2018-08-20 17:16:22 +0200 |
commit | d4bbfb8453f2161fd21e6f3c00023edf43cc88fc (patch) | |
tree | cf08e1c64d498892e5a8cf129064d8ab78781531 | |
parent | d48786f68264ed23f8c3aa847e672a24d1cf4944 (diff) | |
download | mpv-d4bbfb8453f2161fd21e6f3c00023edf43cc88fc.tar.bz2 mpv-d4bbfb8453f2161fd21e6f3c00023edf43cc88fc.tar.xz |
osdep: make use of HAVE_ANDROID
-rw-r--r-- | osdep/io.h | 4 | ||||
-rw-r--r-- | osdep/posix-spawn.h | 4 | ||||
-rw-r--r-- | osdep/strnlen.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/osdep/io.h b/osdep/io.h index e0d6284baa..7e8a267541 100644 --- a/osdep/io.h +++ b/osdep/io.h @@ -33,7 +33,7 @@ #include <glob.h> #endif -#ifdef __ANDROID__ +#if HAVE_ANDROID # include <unistd.h> # include <stdio.h> @@ -58,7 +58,7 @@ static inline int mp_fseeko(FILE* fp, off64_t offset, int whence) { } #define fseeko(f,p,w) mp_fseeko((f), (p), (w)) -#endif // __ANDROID__ +#endif // HAVE_ANDROID #ifndef O_BINARY #define O_BINARY 0 diff --git a/osdep/posix-spawn.h b/osdep/posix-spawn.h index d8bf874c98..fdba50149c 100644 --- a/osdep/posix-spawn.h +++ b/osdep/posix-spawn.h @@ -19,7 +19,9 @@ #pragma once -#ifdef __ANDROID__ +#include "config.h" + +#if HAVE_ANDROID // posix_spawn(p) does not exist at all on Android #include "osdep/android/posix-spawn.h" #else diff --git a/osdep/strnlen.h b/osdep/strnlen.h index 0a971d0ab0..e66932a89a 100644 --- a/osdep/strnlen.h +++ b/osdep/strnlen.h @@ -20,7 +20,9 @@ #ifndef MP_OSDEP_STRNLEN #define MP_OSDEP_STRNLEN -#ifdef __ANDROID__ +#include "config.h" + +#if HAVE_ANDROID // strnlen is broken on current android ndk, see https://code.google.com/p/android/issues/detail?id=74741 #include "osdep/android/strnlen.h" #define strnlen freebsd_strnlen |