- rename config.h to engine_config.h to avoid possible problems with include directories order

src/CMakeLists.txt

@@ -57,6 +57,7 @@ if (USE_MUSL)
 endif()
 
 set (RTPHONE_SOURCES
+    ${rtphone_engine}/engine_config.h
     ${rtphone_engine}/media/MT_Statistics.cpp
     ${rtphone_engine}/media/MT_WebRtc.cpp
     ${rtphone_engine}/media/MT_Stream.cpp

src/engine/audio/Audio_Interface.h

@@ -7,7 +7,7 @@
 #define __AUDIO_INTERFACE_H
 
 #include <string>
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Types.h"
 #include "../helper/HL_VariantMap.h"
 #include "../helper/HL_Pointer.h"

src/engine/audio/Audio_Mixer.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Exception.h"
 #include "../helper/HL_Log.h"
 

src/engine/audio/Audio_Mixer.h

@@ -6,7 +6,7 @@
 #ifndef _RX_MIXER_H
 #define _RX_MIXER_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_ByteBuffer.h"
 #include "../helper/HL_Sync.h"
 #include "Audio_Resampler.h"

src/engine/audio/Audio_Quality.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "Audio_Quality.h"
 #include "../helper/HL_Exception.h"
 #include "../helper/HL_Types.h"

src/engine/audio/Audio_Quality.h

@@ -5,7 +5,7 @@
 
 #ifndef __AUDIO_QUALITY_H
 #define __AUDIO_QUALITY_H
-#include "../config.h"
+#include "../engine_config.h"
 #include "../helper/HL_Sync.h"
 #include <vector>
 

src/engine/audio/Audio_Resampler.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "Audio_Resampler.h"
 #include <stdlib.h>
 #include <assert.h>

src/engine/audio/Audio_WavFile.cpp

@@ -7,7 +7,7 @@
 #include "helper/HL_Exception.h"
 #include "helper/HL_String.h"
 #include "helper/HL_Log.h"
-#include "../config.h"
+#include "../engine_config.h"
 
 #include <memory.h>
 #include <assert.h>

src/engine/endpoint/EP_Engine.h

@@ -47,7 +47,7 @@
 #include "../ice/ICETime.h"
 #include <sstream>
 #include <time.h>
-#include "../config.h"
+#include "../engine_config.h"
 #include "EP_Session.h"
 #include "EP_Observer.h"
 #include "EP_DataProvider.h"

src/engine/endpoint/EP_Session.h

@@ -35,7 +35,7 @@
 #include <atomic>
 #include <time.h>
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "EP_Account.h"
 #include "EP_DataProvider.h"
 #include "EP_AudioProvider.h"

src/engine/engine_config.h

@@ -1,4 +1,4 @@
-/* Copyright(C) 2007-2020 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

src/engine/helper/HL_NetworkSocket.cpp

@@ -7,7 +7,7 @@
 # include <asm/ioctls.h>
 #endif
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "HL_NetworkSocket.h"
 
 #if defined(TARGET_OSX) || defined(TARGET_LINUX)

src/engine/helper/HL_SocketHeap.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #ifdef WIN32
 #include <winsock2.h>
 #include <windows.h>

src/engine/helper/HL_SocketHeap.h

@@ -6,7 +6,7 @@
 #ifndef __SOCKET_HEAP_H
 #define __SOCKET_HEAP_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
 #include <vector>
 #include <algorithm>

src/engine/media/MT_AmrCodec.h

@@ -1,7 +1,7 @@
 #ifndef MT_AMRCODEC_H
 #define MT_AMRCODEC_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
 #include "MT_Codec.h"
 #include "../helper/HL_Pointer.h"

src/engine/media/MT_AudioCodec.cpp

@@ -5,7 +5,7 @@
 
 #define NOMINMAX
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_AudioCodec.h"
 #include "MT_CodecList.h"
 #include "../helper/HL_Exception.h"

src/engine/media/MT_AudioCodec.h

@@ -6,7 +6,7 @@
 #ifndef __AUDIO_CODEC_H
 #define __AUDIO_CODEC_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <map>
 #include "MT_Codec.h"
 #include "../audio/Audio_Resampler.h"

src/engine/media/MT_AudioReceiver.cpp

@@ -5,7 +5,7 @@
 
 #define NOMINMAX
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_AudioReceiver.h"
 #include "MT_AudioCodec.h"
 #include "MT_CngHelper.h"

src/engine/media/MT_AudioStream.h

@@ -6,7 +6,7 @@
 #ifndef __MT_AUDIOSTREAM_H
 #define __MT_AUDIOSTREAM_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_Stream.h"
 #include "MT_NativeRtpSender.h"
 #include "MT_SingleAudioStream.h"

src/engine/media/MT_CngHelper.cpp

@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "../engine_config.h"
 
 #include "MT_CngHelper.h"
 #include <stdlib.h>

src/engine/media/MT_CodecList.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <list>
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_CodecList.h"
 #include "MT_AudioCodec.h"
 

src/engine/media/MT_CodecList.h

@@ -6,7 +6,7 @@
 #ifndef __MT_CODEC_LIST_H
 #define __MT_CODEC_LIST_H
 
-#include "../config.h"
+#include "../engine_config.h"
 
 #if defined(USE_RESIP_INTEGRATION)
 # include "resiprocate/resip/stack/SdpContents.hxx"

src/engine/media/MT_Dtmf.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_Dtmf.h"
 
 

src/engine/media/MT_Dtmf.h

@@ -6,7 +6,7 @@
 #ifndef MT_DTMF
 #define MT_DTMF
 
-#include "../config.h"
+#include "../engine_config.h"
 #include <vector>
 #include <string>
 #include "../helper/HL_ByteBuffer.h"

src/engine/media/MT_EvsCodec.h

@@ -1,5 +1,7 @@
-#pragma once
+#ifndef __MT_EVS_CODEC_H
+#define __MT_EVS_CODEC_H
 
+#include "../engine_config.h"
 #include <set>
 #include <map>
 #include <memory>
@@ -10,7 +12,6 @@
 #include <assert.h>
 #include <sstream>
 
-#include "config.h"
 #include "MT_Codec.h"
 
 #include "libevs/lib_com/prot.h"
@@ -40,7 +41,7 @@ public:
 
     public:
         EVSFactory(StreamParameters& sp);
-        const char* name() { return MT_EVS_CODECNAME; };
+        const char* name() { return MT_EVS_CODECNAME; }
         int samplerate();
         int payloadType();
         PCodec create();
@@ -51,7 +52,7 @@ public:
     EVSCodec(const StreamParameters& sp);
     ~EVSCodec() override;
 
-    const char* name() override { return MT_EVS_CODECNAME; } ;
+    const char* name() override { return MT_EVS_CODECNAME; }
     int samplerate() override;
     int pcmLength() override;
     int frameTime() override;
@@ -68,3 +69,5 @@ private:
 };
 
 } // End of namespace
+
+#endif

src/engine/media/MT_NativeRtpSender.h

@@ -6,7 +6,7 @@
 #ifndef __MT_NATIVE_RTP_SENDER_H
 #define __MT_NATIVE_RTP_SENDER_H
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "jrtplib/src/rtpexternaltransmitter.h"
 #include "srtp/include/srtp.h"
 #include "../helper/HL_NetworkSocket.h"

src/engine/media/MT_WebRtc.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "../config.h"
+#include "../engine_config.h"
 #include "MT_WebRtc.h"
 #include "../helper/HL_Exception.h"