From c868b99ff3148d276d52825d8dd46f4c7652b52e Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Fri, 2 Mar 2012 17:02:51 +0000 Subject: [PATCH] Remove building errors in autotest Review URL: https://webrtc-codereview.appspot.com/432004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1828 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/interface/vie_autotest_defines.h | 13 ------------- .../auto_test/source/vie_autotest_custom_call.cc | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/video_engine/test/auto_test/interface/vie_autotest_defines.h b/src/video_engine/test/auto_test/interface/vie_autotest_defines.h index 34d489b6f..536747130 100644 --- a/src/video_engine/test/auto_test/interface/vie_autotest_defines.h +++ b/src/video_engine/test/auto_test/interface/vie_autotest_defines.h @@ -206,17 +206,4 @@ namespace { #define AutoTestSleep ::Sleep #endif -#ifdef WEBRTC_ANDROID -namespace { - void Sleep(unsigned long x) { - timespec t; - t.tv_sec = x/1000; - t.tv_nsec = (x-(x/1000)*1000)*1000000; - nanosleep(&t,NULL); - } -} - -#define AutoTestSleep ::Sleep -#endif - #endif // WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_DEFINES_H_ diff --git a/src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc index fa8bf760e..9e5911910 100644 --- a/src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc +++ b/src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc @@ -87,9 +87,8 @@ bool GetVideoDevice(webrtc::ViEBase* ptrViEBase, webrtc::ViECapture* ptrViECapture, char* captureDeviceName, char* captureDeviceUniqueId); bool GetIPAddress(char* IP); -#ifndef WEBRTC_ANDROID bool ValidateIP(std::string iStr); -#endif + // The following are Print to stdout functions. void PrintCallInformation(char* IP, char* videoCaptureDeviceName, char* videoCaptureUniqueId,