morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixes for llvm-mingw build

Browse Source
This commit is contained in:
Alexandru Bagu
2023-05-03 12:49:41 +00:00
committed by Martin Fleisz
parent 9ddd21e909
commit a231c09fff
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/freerdp/codec/audio.h
View File

@@ -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
/**

3
libfreerdp/utils/CMakeLists.txt
View File

@@ -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)

4
libfreerdp/utils/signal.c
View File

@@ -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;
}

6
winpr/include/winpr/crt.h
View File

@@ -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 */