Fix the darwin build

Change-Id: I87bd356f7673bdbcc8e5f196f4a89182b3a36cbe
joneschrisg · Aug 24, 2011 · 88fceb0 · 88fceb0
1 parent 09e7673
commit 88fceb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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