aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-08-24 09:03:32 -0700
committerAndroid Code Review <code-review@android.com>2011-08-24 09:03:32 -0700
commite95ae1423e69481806f485fb5fd2b635ad4ba3fb (patch)
tree37e5184229fb0df7ebd6b08bc1f006075679d263 /android
parentd6ae8b852bc80b2df223e6d7218714b5ed0418d1 (diff)
parent0620f37593cc760cfab891defeff04e00be09260 (diff)
downloadexternal_qemu-e95ae1423e69481806f485fb5fd2b635ad4ba3fb.zip
external_qemu-e95ae1423e69481806f485fb5fd2b635ad4ba3fb.tar.gz
external_qemu-e95ae1423e69481806f485fb5fd2b635ad4ba3fb.tar.bz2
Merge "Fix the build by #ifdefing linux-only includes"
Diffstat (limited to 'android')
-rwxr-xr-xandroid/camera/camera-format-converters.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/android/camera/camera-format-converters.c b/android/camera/camera-format-converters.c
index e966e59..dfaa6c2 100755
--- a/android/camera/camera-format-converters.c
+++ b/android/camera/camera-format-converters.c
@@ -17,9 +17,11 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#elif defined(__APPLE__)
+#else
#include <linux/videodev2.h>
-#endif /* _WIN32 */
+#endif
#include "android/camera/camera-format-converters.h"
/* Describes a convertor for one pixel format to another. */