From 88fceb022e53ede2f6a7e57a8cbd63f5ac2e1bb3 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Wed, 24 Aug 2011 09:51:38 -0700 Subject: Fix the darwin build Change-Id: I87bd356f7673bdbcc8e5f196f4a89182b3a36cbe --- android/camera/camera-common.h | 5 ++++- android/camera/camera-format-converters.c | 2 +- 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 #include #ifdef _WIN32 -#elif defined(__APPLE__) +#elif _DARWIN_C_SOURCE #else #include #endif -- cgit v1.1