From a231c09fff9efff85bae45b1e1281273a471aaec Mon Sep 17 00:00:00 2001
From: Alexandru Bagu <alexandru.bagu@gmail.com>
Date: Wed, 3 May 2023 12:49:41 +0000
Subject: [PATCH] fixes for llvm-mingw build

---
 include/freerdp/codec/audio.h   | 10 +++++++---
 libfreerdp/utils/CMakeLists.txt |  3 ++-
 libfreerdp/utils/signal.c       |  4 ++--
 winpr/include/winpr/crt.h       |  6 ++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/include/freerdp/codec/audio.h b/include/freerdp/codec/audio.h
index 04cb9ef42..cc91be950 100644
--- a/include/freerdp/codec/audio.h
+++ b/include/freerdp/codec/audio.h
@@ -70,13 +70,15 @@ typedef struct AUDIO_FORMAT AUDIO_FORMAT;
  * http://tools.ietf.org/html/rfc2361
  */
 
-#ifndef __MINGW32__
+#ifndef WAVE_FORMAT_UNKNOWN
 #define WAVE_FORMAT_UNKNOWN 0x0000
+#endif /* !WAVE_FORMAT_UNKNOWN */
 
 #ifndef WAVE_FORMAT_PCM
 #define WAVE_FORMAT_PCM 0x0001
-#endif
+#endif /* !WAVE_FORMAT_PCM */
 
+#ifndef WAVE_FORMAT_ADPCM
 #define WAVE_FORMAT_ADPCM 0x0002
 #define WAVE_FORMAT_IEEE_FLOAT 0x0003
 #define WAVE_FORMAT_VSELP 0x0004
@@ -122,11 +124,13 @@ typedef struct AUDIO_FORMAT AUDIO_FORMAT;
 #define WAVE_FORMAT_MPEG 0x0050
 #define WAVE_FORMAT_RT24 0x0052
 #define WAVE_FORMAT_PAC 0x0053
+#endif /* !WAVE_FORMAT_ADPCM */
 
 #ifndef WAVE_FORMAT_MPEGLAYER3
 #define WAVE_FORMAT_MPEGLAYER3 0x0055
 #endif
 
+#ifndef WAVE_FORMAT_LUCENT_G723
 #define WAVE_FORMAT_LUCENT_G723 0x0059
 #define WAVE_FORMAT_CIRRUS 0x0060
 #define WAVE_FORMAT_ESPCM 0x0061
@@ -185,7 +189,7 @@ typedef struct AUDIO_FORMAT AUDIO_FORMAT;
 #define WAVE_FORMAT_NORRIS 0x1400
 #define WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS 0x1500
 #define WAVE_FORMAT_DVM 0x2000
-#endif /* !__MINGW32__ */
+#endif /* !WAVE_FORMAT_LUCENT_G723 */
 #define WAVE_FORMAT_AAC_MS 0xA106
 
 /**
diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt
index f3caf7da7..980b1b6a7 100644
--- a/libfreerdp/utils/CMakeLists.txt
+++ b/libfreerdp/utils/CMakeLists.txt
@@ -41,7 +41,8 @@ freerdp_library_add(${CMAKE_THREAD_LIBS_INIT})
 
 if(WIN32)
 	freerdp_library_add(ws2_32)
-	freerdp_library_add(Credui)
+	freerdp_library_add(credui)
+	freerdp_library_add(cfgmgr32)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
diff --git a/libfreerdp/utils/signal.c b/libfreerdp/utils/signal.c
index e78979b38..506e98c76 100644
--- a/libfreerdp/utils/signal.c
+++ b/libfreerdp/utils/signal.c
@@ -43,12 +43,12 @@ int freerdp_handle_signals(void)
 	return -1;
 }
 
-BOOL freerdp_add_signal_cleanup_handler(void* context, void (*fkt)(void*))
+BOOL freerdp_add_signal_cleanup_handler(void* context, freerdp_signal_handler_t fkt)
 {
 	return FALSE;
 }
 
-BOOL freerdp_del_signal_cleanup_handler(void* context, void (*fkt)(void*))
+BOOL freerdp_del_signal_cleanup_handler(void* context, freerdp_signal_handler_t fkt)
 {
 	return FALSE;
 }
diff --git a/winpr/include/winpr/crt.h b/winpr/include/winpr/crt.h
index 8c9f4c20b..81b983d1e 100644
--- a/winpr/include/winpr/crt.h
+++ b/winpr/include/winpr/crt.h
@@ -163,8 +163,6 @@ extern "C"
 }
 #endif
 
-#else
-#define winpr_aligned_calloc(count, size, alignment) _aligned_recalloc(NULL, count, size, alignment)
 #endif /* _WIN32 */
 
 #if !defined(_WIN32) || (defined(__MINGW32__) && !defined(_UCRT))
@@ -225,4 +223,8 @@ extern "C"
 #define winpr_aligned_free _aligned_free
 #endif /* !defined(_WIN32) || (defined(__MINGW32__) ... */
 
+#if defined(_WIN32) && (!defined(__MINGW32__) || defined(_UCRT))
+#define winpr_aligned_calloc(count, size, alignment) _aligned_recalloc(NULL, count, size, alignment)
+#endif /* defined(_WIN32) && (!defined(__MINGW32__) || defined(_UCRT)) */
+
 #endif /* WINPR_CRT_H */