From c3e51acb30a3bd9d42595bb62d1a789502f57580 Mon Sep 17 00:00:00 2001 From: "sjlee@webrtc.org" Date: Tue, 17 Sep 2013 05:14:32 +0000 Subject: [PATCH] To use the channel_transport on the iOS platform, some #if directives are changed. R=mallinath@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2178005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4759 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/test/channel_transport/channel_transport.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/test/channel_transport/channel_transport.cc b/webrtc/test/channel_transport/channel_transport.cc index 979163bff..9500c9030 100644 --- a/webrtc/test/channel_transport/channel_transport.cc +++ b/webrtc/test/channel_transport/channel_transport.cc @@ -12,7 +12,7 @@ #include -#ifndef WEBRTC_ANDROID +#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) #include "testing/gtest/include/gtest/gtest.h" #endif #include "webrtc/test/channel_transport/udp_transport.h" @@ -20,7 +20,7 @@ #include "webrtc/video_engine/vie_defines.h" #include "webrtc/voice_engine/include/voe_network.h" -#ifdef WEBRTC_ANDROID +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) #undef NDEBUG #include #endif @@ -36,7 +36,7 @@ VoiceChannelTransport::VoiceChannelTransport(VoENetwork* voe_network, socket_transport_ = UdpTransport::Create(channel, socket_threads); int registered = voe_network_->RegisterExternalTransport(channel, *socket_transport_); -#ifndef WEBRTC_ANDROID +#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) EXPECT_EQ(0, registered); #else assert(registered == 0); @@ -88,7 +88,7 @@ VideoChannelTransport::VideoChannelTransport(ViENetwork* vie_network, socket_transport_ = UdpTransport::Create(channel, socket_threads); int registered = vie_network_->RegisterSendTransport(channel, *socket_transport_); -#ifndef WEBRTC_ANDROID +#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) EXPECT_EQ(0, registered); #else assert(registered == 0);