diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-08-24 09:03:32 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-08-24 09:03:32 -0700 |
commit | e95ae1423e69481806f485fb5fd2b635ad4ba3fb (patch) | |
tree | 37e5184229fb0df7ebd6b08bc1f006075679d263 /android | |
parent | d6ae8b852bc80b2df223e6d7218714b5ed0418d1 (diff) | |
parent | 0620f37593cc760cfab891defeff04e00be09260 (diff) | |
download | external_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-x | android/camera/camera-format-converters.c | 6 |
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. */
|