Change macro to build jpeg for android on arm and x86

Review URL: http://webrtc-codereview.appspot.com/68003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@191 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-07-12 21:52:31 +00:00 · 2011-07-12 21:52:31 +00:00 · 8babfdbb03
commit 8babfdbb03
parent 0ee7dae246
2 changed files with 4 additions and 4 deletions
--- a/src/common_video/jpeg/main/source/data_manager.cc
+++ b/src/common_video/jpeg/main/source/data_manager.cc
@ -14,11 +14,11 @@

 #include "data_manager.h"

-#ifdef WEBRTC_ANDROID
+#ifdef ANDROID
 extern "C" {
 #endif
 #include "jpeglib.h"
-#ifdef WEBRTC_ANDROID
+#ifdef ANDROID
 }
 #endif
 #include "jmorecfg.h"
--- a/src/common_video/jpeg/main/source/jpeg.cc
+++ b/src/common_video/jpeg/main/source/jpeg.cc
@ -22,11 +22,11 @@
 #if defined(WIN32)
 #include <basetsd.h>
 #endif
-#ifdef WEBRTC_ANDROID
+#ifdef ANDROID
 extern "C" {
 #endif
 #include "jpeglib.h"
-#ifdef WEBRTC_ANDROID
+#ifdef ANDROID
 }
 #endif
 #include <setjmp.h>