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

[freerdp,API] fix broken deprecation declarations

Browse Source
This commit is contained in:
Armin Novak
2026-03-03 16:58:32 +01:00
parent 63df758f73
commit 7485c01a8c
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/freerdp/freerdp.h
View File

@@ -220,11 +220,10 @@ extern "C"
* a certificate only for this session, 0 otherwise. * a certificate only for this session, 0 otherwise.
*/ */
#if defined(WITH_FREERDP_DEPRECATED) #if defined(WITH_FREERDP_DEPRECATED)
typedef WINPR_DEPRECATED_VAR( WINPR_DEPRECATED_VAR("Use pVerifyCertificateEx",
"Use pVerifyCertificateEx", typedef DWORD (*pVerifyCertificate)(
DWORD (*pVerifyCertificate)(freerdp* instance, const char* common_name, const char* subject, freerdp* instance, const char* common_name, const char* subject,
const char* issuer, const char* fingerprint, const char* issuer, const char* fingerprint, BOOL host_mismatch));
BOOL host_mismatch));
#endif #endif
/** @brief Callback used if user interaction is required to accept /** @brief Callback used if user interaction is required to accept
@@ -262,12 +261,12 @@ extern "C"
* a certificate only for this session, 0 otherwise. * a certificate only for this session, 0 otherwise.
*/ */
#if defined(WITH_FREERDP_DEPRECATED) #if defined(WITH_FREERDP_DEPRECATED)
typedef WINPR_DEPRECATED_VAR( WINPR_DEPRECATED_VAR("Use pVerifyChangedCertificateEx",
"Use pVerifyChangedCertificateEx", typedef DWORD (*pVerifyChangedCertificate)(
DWORD (*pVerifyChangedCertificate)(freerdp* instance, const char* common_name, freerdp* instance, const char* common_name, const char* subject,
const char* subject, const char* issuer, const char* issuer, const char* new_fingerprint,
const char* new_fingerprint, const char* old_subject, const char* old_subject, const char* old_issuer,
const char* old_issuer, const char* old_fingerprint)); const char* old_fingerprint));
#endif #endif
/** @brief Callback used if user interaction is required to accept /** @brief Callback used if user interaction is required to accept

9
include/freerdp/settings.h
View File

@@ -239,9 +239,8 @@ extern "C"
FREERDP_API ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, FREERDP_API ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings,
const char* name); const char* name);
#if defined(WITH_FREERDP_DEPRECATED) #if defined(WITH_FREERDP_DEPRECATED)
WINPR_DEPRECATED( WINPR_DEPRECATED(WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1)
WINPR_ATTR_NODISCARD FREERDP_API ADDIN_ARGV* WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) FREERDP_API ADDIN_ARGV* freerdp_static_channel_clone(ADDIN_ARGV* channel));
WINPR_ATTR_NODISCARD freerdp_static_channel_clone(ADDIN_ARGV* channel));
#endif #endif
FREERDP_API void freerdp_static_channel_collection_free(rdpSettings* settings); FREERDP_API void freerdp_static_channel_collection_free(rdpSettings* settings);
@@ -259,8 +258,8 @@ extern "C"
#if defined(WITH_FREERDP_DEPRECATED) #if defined(WITH_FREERDP_DEPRECATED)
WINPR_DEPRECATED( WINPR_DEPRECATED(
WINPR_ATTR_NODISCARD FREERDP_API ADDIN_ARGV* WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1)
WINPR_ATTR_NODISCARD freerdp_dynamic_channel_clone(ADDIN_ARGV* channel)); FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel));
#endif #endif
FREERDP_API void freerdp_dynamic_channel_collection_free(rdpSettings* settings); FREERDP_API void freerdp_dynamic_channel_collection_free(rdpSettings* settings);