Remove API-related #defines from voice_engine_configurations.h

webrtc/voice_engine/voe_rtp_rtcp_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/voe_rtp_rtcp_impl.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 
-#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
-#error "Deprecated"
-#endif
-
 namespace webrtc {
 
 VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) {
-#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
-  return NULL;
-#else
   if (NULL == voiceEngine) {
     return NULL;
   }
   VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
   s->AddRef();
   return s;
-#endif
 }
 
-#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
-
 VoERTP_RTCPImpl::VoERTP_RTCPImpl(voe::SharedData* shared) : _shared(shared) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "VoERTP_RTCPImpl::VoERTP_RTCPImpl() - ctor");
 }
 
 VoERTP_RTCPImpl::~VoERTP_RTCPImpl() {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "VoERTP_RTCPImpl::~VoERTP_RTCPImpl() - dtor");
 }
 
@@ skipping 258 matching lines @@
   voe::Channel* channelPtr = ch.channel();
   if (channelPtr == NULL) {
     _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
                           "SetNACKStatus() failed to locate channel");
     return -1;
   }
   channelPtr->SetNACKStatus(enable, maxNoPackets);
   return 0;
 }
 
-#endif  // #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
-
 }  // namespace webrtc