aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rwxr-xr-xandroid/camera/camera-common.h5
-rwxr-xr-xandroid/camera/camera-format-converters.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/android/camera/camera-common.h b/android/camera/camera-common.h
index 4aa988e..2101dfc 100755
--- a/android/camera/camera-common.h
+++ b/android/camera/camera-common.h
@@ -22,7 +22,10 @@
* camera emulation.
*/
-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef _WIN32
+/* Include declarations that are missing in non-Linux headers. */
+#include "android/camera/camera-win.h"
+#elif _DARWIN_C_SOURCE
/* Include declarations that are missing in non-Linux headers. */
#include "android/camera/camera-win.h"
#endif /* _WIN32 */
diff --git a/android/camera/camera-format-converters.c b/android/camera/camera-format-converters.c
index dfaa6c2..139e5ab 100755
--- a/android/camera/camera-format-converters.c
+++ b/android/camera/camera-format-converters.c
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef _WIN32
-#elif defined(__APPLE__)
+#elif _DARWIN_C_SOURCE
#else
#include <linux/videodev2.h>
#endif