From 8babfdbb03399743a0c18065771b27b772c6c804 Mon Sep 17 00:00:00 2001 From: "leozwang@google.com" Date: Tue, 12 Jul 2011 21:52:31 +0000 Subject: [PATCH] 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 --- src/common_video/jpeg/main/source/data_manager.cc | 4 ++-- src/common_video/jpeg/main/source/jpeg.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common_video/jpeg/main/source/data_manager.cc b/src/common_video/jpeg/main/source/data_manager.cc index 2e2a870ccd..f2836408a7 100644 --- 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" diff --git a/src/common_video/jpeg/main/source/jpeg.cc b/src/common_video/jpeg/main/source/jpeg.cc index 004ecb7e93..7f2927aa3c 100644 --- 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 #endif -#ifdef WEBRTC_ANDROID +#ifdef ANDROID extern "C" { #endif #include "jpeglib.h" -#ifdef WEBRTC_ANDROID +#ifdef ANDROID } #endif #include