mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added deprecation macro.

Browse Source
This commit is contained in:
Armin Novak 2019-09-02 15:58:16 +02:00
parent f93d625cde
commit d99486096b
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/freerdp/settings.h
View File

@ -1599,20 +1599,20 @@ FREERDP_API void freerdp_update_gateway_usage_method(rdpSettings* settings, UINT
* the functions freerdp_get_param_* and freerdp_set_param_* are deprecated. * the functions freerdp_get_param_* and freerdp_set_param_* are deprecated.
* use freerdp_settings_get_* and freerdp_settings_set_* as a replacement! * use freerdp_settings_get_* and freerdp_settings_set_* as a replacement!
*/ */
FREERDP_API BOOL freerdp_get_param_bool(rdpSettings* settings, int id); FREERDP_API WINPR_DEPRECATED(BOOL freerdp_get_param_bool(rdpSettings* settings, int id));
FREERDP_API int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param); FREERDP_API WINPR_DEPRECATED(int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param));
FREERDP_API int freerdp_get_param_int(rdpSettings* settings, int id); FREERDP_API WINPR_DEPRECATED(int freerdp_get_param_int(rdpSettings* settings, int id));
FREERDP_API int freerdp_set_param_int(rdpSettings* settings, int id, int param); FREERDP_API WINPR_DEPRECATED(int freerdp_set_param_int(rdpSettings* settings, int id, int param));
FREERDP_API UINT32 freerdp_get_param_uint32(rdpSettings* settings, int id); FREERDP_API WINPR_DEPRECATED(UINT32 freerdp_get_param_uint32(rdpSettings* settings, int id));
FREERDP_API int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param); FREERDP_API WINPR_DEPRECATED(int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param));
FREERDP_API UINT64 freerdp_get_param_uint64(rdpSettings* settings, int id); FREERDP_API WINPR_DEPRECATED(UINT64 freerdp_get_param_uint64(rdpSettings* settings, int id));
FREERDP_API int freerdp_set_param_uint64(rdpSettings* settings, int id, UINT64 param); FREERDP_API WINPR_DEPRECATED(int freerdp_set_param_uint64(rdpSettings* settings, int id, UINT64 param));
FREERDP_API char* freerdp_get_param_string(rdpSettings* settings, int id); FREERDP_API WINPR_DEPRECATED(char* freerdp_get_param_string(rdpSettings* settings, int id));
FREERDP_API int freerdp_set_param_string(rdpSettings* settings, int id, const char* param); FREERDP_API WINPR_DEPRECATED(int freerdp_set_param_string(rdpSettings* settings, int id, const char* param));
FREERDP_API BOOL freerdp_settings_get_bool(rdpSettings* settings, size_t id); FREERDP_API BOOL freerdp_settings_get_bool(rdpSettings* settings, size_t id);
FREERDP_API BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL param); FREERDP_API BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL param);

8
winpr/include/winpr/winpr.h
View File

@ -47,6 +47,14 @@
#define WINPR_API #define WINPR_API
#endif #endif
#if defined(WIN32) && !defined(__CYGWIN__)
#define WINPR_DEPRECATED(obj) __declspec(deprecated) obj
#elif defined(__GNUC__)
#define WINPR_DEPRECATED(obj) obj __attribute__ ((deprecated))
#else
#define WINPR_DEPRECATED(obj) obj
#endif
/* Thread local storage keyword define */ /* Thread local storage keyword define */
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
#ifdef __GNUC__ #ifdef __GNUC__

4
winpr/include/winpr/wlog.h
View File

@ -180,9 +180,9 @@ WINPR_API wLog* WLog_GetRoot(void);
WINPR_API wLog* WLog_Get(LPCSTR name); WINPR_API wLog* WLog_Get(LPCSTR name);
/** Deprecated */ /** Deprecated */
WINPR_API BOOL WLog_Init(void); WINPR_API WINPR_DEPRECATED(BOOL WLog_Init(void));
/** Deprecated */ /** Deprecated */
WINPR_API BOOL WLog_Uninit(void); WINPR_API WINPR_DEPRECATED(BOOL WLog_Uninit(void));
typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg); typedef BOOL (*wLogCallbackMessage_t)(const wLogMessage* msg);
typedef BOOL (*wLogCallbackData_t)(const wLogMessage* msg); typedef BOOL (*wLogCallbackData_t)(const wLogMessage* msg);