aboutsummaryrefslogtreecommitdiffstats
path: root/android/camera
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-08-24 09:34:00 -0700
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-08-24 09:34:00 -0700
commit09e7673ce669c8dda0037f8e85d644f3f1a7c72f (patch)
tree6bbbac0d3d46384db44907a6cae55557f698d14a /android/camera
parent0620f37593cc760cfab891defeff04e00be09260 (diff)
downloadexternal_qemu-09e7673ce669c8dda0037f8e85d644f3f1a7c72f.zip
external_qemu-09e7673ce669c8dda0037f8e85d644f3f1a7c72f.tar.gz
external_qemu-09e7673ce669c8dda0037f8e85d644f3f1a7c72f.tar.bz2
Fix build break: make sure darwin build picks up on required declarations
Change-Id: I801d56668d8591e599994c65fb47b9c3ea77ff73
Diffstat (limited to 'android/camera')
-rwxr-xr-xandroid/camera/camera-common.h4
-rw-r--r--android/camera/camera-win.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/android/camera/camera-common.h b/android/camera/camera-common.h
index ff5ce0a..4aa988e 100755
--- a/android/camera/camera-common.h
+++ b/android/camera/camera-common.h
@@ -22,8 +22,8 @@
* camera emulation.
*/
-#ifdef _WIN32
-/* Include declarations that are missing in Windows SDK headers. */
+#if defined(_WIN32) || defined(__APPLE__)
+/* Include declarations that are missing in non-Linux headers. */
#include "android/camera/camera-win.h"
#endif /* _WIN32 */
diff --git a/android/camera/camera-win.h b/android/camera/camera-win.h
index 3c04eb2..14f88f5 100644
--- a/android/camera/camera-win.h
+++ b/android/camera/camera-win.h
@@ -18,7 +18,7 @@
#define ANDROID_CAMERA_CAMERA_WIN_H_
/*
- * Contains declarations that are missing in Windows SDK headers.
+ * Contains declarations that are missing in non-Linux headers.
*/
/* Four-character-code (FOURCC) */