diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-08-24 09:52:10 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-08-24 09:52:10 -0700 |
| commit | 6c13702fee11a40c72e71432c5438fc65602bd5d (patch) | |
| tree | 5e320c96d7257e300869fa6635edecf8b0e0b6d7 /android | |
| parent | fb81fbc2de3a70e509faf8a064554e01040bb40a (diff) | |
| parent | 88fceb022e53ede2f6a7e57a8cbd63f5ac2e1bb3 (diff) | |
| download | external_qemu-6c13702fee11a40c72e71432c5438fc65602bd5d.zip external_qemu-6c13702fee11a40c72e71432c5438fc65602bd5d.tar.gz external_qemu-6c13702fee11a40c72e71432c5438fc65602bd5d.tar.bz2 | |
Merge "Fix the darwin build"
Diffstat (limited to 'android')
| -rwxr-xr-x | android/camera/camera-common.h | 5 | ||||
| -rwxr-xr-x | 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 <stdio.h> #include <stdlib.h> #ifdef _WIN32 -#elif defined(__APPLE__) +#elif _DARWIN_C_SOURCE #else #include <linux/videodev2.h> #endif |