From 57da7187346efad10db356a551cba4468a35472b Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Tue, 6 Mar 2012 21:28:48 +0000 Subject: [PATCH] Fix building errors on android TBR=mflodman Review URL: https://webrtc-codereview.appspot.com/441001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1850 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_render/main/test/testAPI/testAPI.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/video_render/main/test/testAPI/testAPI.cc b/src/modules/video_render/main/test/testAPI/testAPI.cc index 66c1dac70d..9eb653e916 100644 --- a/src/modules/video_render/main/test/testAPI/testAPI.cc +++ b/src/modules/video_render/main/test/testAPI/testAPI.cc @@ -22,7 +22,7 @@ #include #include -#elif defined(WEBRTC_LINUX) +#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) #include #include @@ -177,7 +177,7 @@ int WebRtcCreateWindow(HWND &hwndMain,int winNum, int width, int height) return 0; } -#elif defined(WEBRTC_LINUX) +#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) int WebRtcCreateWindow(Window *outWindow, Display **outDisplay, int winNum, int width, int height) // unsigned char* title, int titleLength)