49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
|
From 0a35fd99e25e085a4826a7e5af4711034fec2eed Mon Sep 17 00:00:00 2001
|
||
|
|
From: yanying <201250106@smail.nju.edu.cn>
|
||
|
|
Date: Mon, 5 Aug 2024 23:42:40 +0800
|
||
|
|
Subject: [PATCH] Fix clang incompatible function pointer error
|
||
|
|
|
||
|
|
---
|
||
|
|
libfreerdp/codec/rfx.c | 4 ++--
|
||
|
|
winpr/include/winpr/collections.h | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
|
||
|
|
index ccbc5afe4..eec736558 100644
|
||
|
|
--- a/libfreerdp/codec/rfx.c
|
||
|
|
+++ b/libfreerdp/codec/rfx.c
|
||
|
|
@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void* rfx_decoder_tile_new(void* val)
|
||
|
|
+static void* rfx_decoder_tile_new(const void* val)
|
||
|
|
{
|
||
|
|
RFX_TILE* tile = NULL;
|
||
|
|
WINPR_UNUSED(val);
|
||
|
|
@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void* rfx_encoder_tile_new(void* val)
|
||
|
|
+static void* rfx_encoder_tile_new(const void* val)
|
||
|
|
{
|
||
|
|
WINPR_UNUSED(val);
|
||
|
|
return calloc(1, sizeof(RFX_TILE));
|
||
|
|
diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
|
||
|
|
index 807f011d7..b8c8d9d66 100644
|
||
|
|
--- a/winpr/include/winpr/collections.h
|
||
|
|
+++ b/winpr/include/winpr/collections.h
|
||
|
|
@@ -36,7 +36,7 @@ extern "C"
|
||
|
|
{
|
||
|
|
#endif
|
||
|
|
|
||
|
|
- typedef void* (*OBJECT_NEW_FN)(void* val);
|
||
|
|
+ typedef void* (*OBJECT_NEW_FN)(const void* val);
|
||
|
|
typedef void (*OBJECT_INIT_FN)(void* obj);
|
||
|
|
typedef void (*OBJECT_UNINIT_FN)(void* obj);
|
||
|
|
typedef void (*OBJECT_FREE_FN)(void* obj);
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|