diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-08-24 09:36:14 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-08-24 09:36:14 -0700 |
| commit | fb81fbc2de3a70e509faf8a064554e01040bb40a (patch) | |
| tree | 4f2b50d1de53ac07b73ee2ecd79566017dfff066 /android | |
| parent | e95ae1423e69481806f485fb5fd2b635ad4ba3fb (diff) | |
| parent | 09e7673ce669c8dda0037f8e85d644f3f1a7c72f (diff) | |
| download | external_qemu-fb81fbc2de3a70e509faf8a064554e01040bb40a.zip external_qemu-fb81fbc2de3a70e509faf8a064554e01040bb40a.tar.gz external_qemu-fb81fbc2de3a70e509faf8a064554e01040bb40a.tar.bz2 | |
Merge "Fix build break: make sure darwin build picks up on required declarations"
Diffstat (limited to 'android')
| -rwxr-xr-x | android/camera/camera-common.h | 4 | ||||
| -rw-r--r-- | android/camera/camera-win.h | 2 |
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) */ |