diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 26336f7cd..d1b23cf22 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -220,11 +220,10 @@ extern "C" * a certificate only for this session, 0 otherwise. */ #if defined(WITH_FREERDP_DEPRECATED) - typedef WINPR_DEPRECATED_VAR( - "Use pVerifyCertificateEx", - DWORD (*pVerifyCertificate)(freerdp* instance, const char* common_name, const char* subject, - const char* issuer, const char* fingerprint, - BOOL host_mismatch)); + WINPR_DEPRECATED_VAR("Use pVerifyCertificateEx", + typedef DWORD (*pVerifyCertificate)( + freerdp* instance, const char* common_name, const char* subject, + const char* issuer, const char* fingerprint, BOOL host_mismatch)); #endif /** @brief Callback used if user interaction is required to accept @@ -262,12 +261,12 @@ extern "C" * a certificate only for this session, 0 otherwise. */ #if defined(WITH_FREERDP_DEPRECATED) - typedef WINPR_DEPRECATED_VAR( - "Use pVerifyChangedCertificateEx", - DWORD (*pVerifyChangedCertificate)(freerdp* instance, const char* common_name, - const char* subject, const char* issuer, - const char* new_fingerprint, const char* old_subject, - const char* old_issuer, const char* old_fingerprint)); + WINPR_DEPRECATED_VAR("Use pVerifyChangedCertificateEx", + typedef DWORD (*pVerifyChangedCertificate)( + freerdp* instance, const char* common_name, const char* subject, + const char* issuer, const char* new_fingerprint, + const char* old_subject, const char* old_issuer, + const char* old_fingerprint)); #endif /** @brief Callback used if user interaction is required to accept diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index 2e593617c..6d8b6f483 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -239,9 +239,8 @@ extern "C" FREERDP_API ADDIN_ARGV* freerdp_static_channel_collection_find(rdpSettings* settings, const char* name); #if defined(WITH_FREERDP_DEPRECATED) - WINPR_DEPRECATED( - WINPR_ATTR_NODISCARD FREERDP_API ADDIN_ARGV* WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) - WINPR_ATTR_NODISCARD freerdp_static_channel_clone(ADDIN_ARGV* channel)); + WINPR_DEPRECATED(WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) + FREERDP_API ADDIN_ARGV* freerdp_static_channel_clone(ADDIN_ARGV* channel)); #endif FREERDP_API void freerdp_static_channel_collection_free(rdpSettings* settings); @@ -259,8 +258,8 @@ extern "C" #if defined(WITH_FREERDP_DEPRECATED) WINPR_DEPRECATED( - WINPR_ATTR_NODISCARD FREERDP_API ADDIN_ARGV* WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) - WINPR_ATTR_NODISCARD freerdp_dynamic_channel_clone(ADDIN_ARGV* channel)); + WINPR_ATTR_MALLOC(freerdp_addin_argv_free, 1) + FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_clone(ADDIN_ARGV* channel)); #endif FREERDP_API void freerdp_dynamic_channel_collection_free(rdpSettings* settings);