Remove API-related #defines from voice_engine_configurations.h

webrtc/voice_engine/voice_engine_impl.h

Index: webrtc/voice_engine/voice_engine_impl.h
diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h
index 0ce5ca8e1b99cb7ab4d33606810743a1bc223171..b0c821eb5d459b6ecff742fda6320ef524abba47 100644
--- a/webrtc/voice_engine/voice_engine_impl.h
+++ b/webrtc/voice_engine/voice_engine_impl.h
@@ -14,65 +14,18 @@
 #include <memory>
 
 #include "webrtc/system_wrappers/include/atomic32.h"
-#include "webrtc/voice_engine/voe_base_impl.h"
 #include "webrtc/voice_engine_configurations.h"
-
-#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_CODEC_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_FILE_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
-#error "Deprecated"
-#endif
-#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
-#error "Deprecated"
-#endif
-
-#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
+#include "webrtc/voice_engine/voe_base_impl.h"
 #include "webrtc/voice_engine/voe_audio_processing_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_CODEC_API
 #include "webrtc/voice_engine/voe_codec_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
 #include "webrtc/voice_engine/voe_external_media_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_FILE_API
 #include "webrtc/voice_engine/voe_file_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
 #include "webrtc/voice_engine/voe_hardware_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
 #include "webrtc/voice_engine/voe_neteq_stats_impl.h"
-#endif
 #include "webrtc/voice_engine/voe_network_impl.h"
-#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
 #include "webrtc/voice_engine/voe_rtp_rtcp_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
 #include "webrtc/voice_engine/voe_video_sync_impl.h"
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
 #include "webrtc/voice_engine/voe_volume_control_impl.h"
-#endif
 
 namespace webrtc {
 namespace voe {
@@ -81,66 +34,30 @@ class ChannelProxy;
 
 class VoiceEngineImpl : public voe::SharedData,  // Must be the first base class
                         public VoiceEngine,
-#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
                         public VoEAudioProcessingImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_CODEC_API
                         public VoECodecImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
                         public VoEExternalMediaImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_FILE_API
                         public VoEFileImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
                         public VoEHardwareImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
                         public VoENetEqStatsImpl,
-#endif
                         public VoENetworkImpl,
-#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
                         public VoERTP_RTCPImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
                         public VoEVideoSyncImpl,
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
                         public VoEVolumeControlImpl,
-#endif
                         public VoEBaseImpl {
  public:
   VoiceEngineImpl()
       : SharedData(),
-#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
         VoEAudioProcessingImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_CODEC_API
         VoECodecImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
         VoEExternalMediaImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_FILE_API
         VoEFileImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
         VoEHardwareImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
         VoENetEqStatsImpl(this),
-#endif
         VoENetworkImpl(this),
-#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
         VoERTP_RTCPImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
         VoEVideoSyncImpl(this),
-#endif
-#ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
         VoEVolumeControlImpl(this),
-#endif
         VoEBaseImpl(this),
         _ref_count(0) {}
   ~VoiceEngineImpl() override { assert(_ref_count.Value() == 0); }