From 15e0437f69ccfc18c96599f319dc472085c31bb5 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 27 Sep 2022 09:22:45 +0200 Subject: [PATCH] Fix std max build errors on Windows --- linphone-app/CMakeLists.txt | 1 + linphone-app/src/components/call/CallListener.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 1d1f410e8..0493b0661 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -123,6 +123,7 @@ endif() if( WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order + add_definitions(-DNOMINMAX) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h diff --git a/linphone-app/src/components/call/CallListener.hpp b/linphone-app/src/components/call/CallListener.hpp index 9ae2bf5c8..6711bc419 100644 --- a/linphone-app/src/components/call/CallListener.hpp +++ b/linphone-app/src/components/call/CallListener.hpp @@ -39,7 +39,7 @@ public: virtual void onRemoteRecording(const std::shared_ptr & call, bool recording) override; signals: - virtual void remoteRecording(const std::shared_ptr & call, bool recording); + void remoteRecording(const std::shared_ptr & call, bool recording); }; Q_DECLARE_METATYPE(CallListener*)