From 094434fd335b95e8bdb986315664fe4c7c5e6820 Mon Sep 17 00:00:00 2001 From: "leozwang@google.com" Date: Wed, 3 Aug 2011 21:37:33 +0000 Subject: [PATCH] Replace ANDROID with WEBRTC_ANDROID [video capture] Review URL: http://webrtc-codereview.appspot.com/99001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@297 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_capture/main/source/video_capture_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/video_capture/main/source/video_capture_impl.cc b/src/modules/video_capture/main/source/video_capture_impl.cc index b33e9137fc..80cc673bb5 100644 --- a/src/modules/video_capture/main/source/video_capture_impl.cc +++ b/src/modules/video_capture/main/source/video_capture_impl.cc @@ -16,7 +16,7 @@ #include "video_capture_config.h" #include "module_common_types.h" -#ifdef ANDROID +#ifdef WEBRTC_ANDROID #include "video_capture_android.h" // Need inclusion here to set Java environment. #endif @@ -38,7 +38,7 @@ void VideoCaptureModule::Destroy(VideoCaptureModule* module) delete module; } -#ifdef ANDROID +#ifdef WEBRTC_ANDROID WebRtc_Word32 VideoCaptureModule::SetAndroidObjects(void* javaVM,void* javaContext) { WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, "SetAndroidObjects");