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

[cmake] Invert WITH_FREERDP_3x_DEPRECATED

Browse Source 
API breaking change, with this logic the symbol needs to be manually
defined by an API user. So, to fix this:
* Rename to DROP_FREERDP_3x_DEPRECATED
* Invert logic, so a undefined value enables the symbols
This commit is contained in:
akallabeth
2025-03-06 10:46:25 +01:00
parent 52fec2cd03
commit 3186977e15
23 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/CMakeLists.txt
View File

@@ -17,10 +17,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if(WITH_FREERDP_3x_DEPRECATED)
if(NOT WITHOUT_FREERDP_3x_DEPRECATED)
option(WITH_OPAQUE_SETTINGS "Hide rdpSettings struct definition, only allow getter/setter access" OFF)
else()
set(WITH_OPAQUE_SETTINGS ON CACHE INTERNAL "WITH_FREERDP_3x_DEPRECATED")
set(WITH_OPAQUE_SETTINGS ON CACHE INTERNAL "NOT WITHOUT_FREERDP_3x_DEPRECATED")
endif()
# prepare paths for C

2
include/freerdp/codecs.h
View File

@@ -86,7 +86,7 @@ extern "C"
WINPR_ATTR_MALLOC(freerdp_client_codecs_free, 1)
FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
FREERDP_API void codecs_free(rdpCodecs* codecs));

6
include/freerdp/freerdp.h
View File

@@ -569,7 +569,7 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_connect(freerdp* instance);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_abort_connect_context instead",
FREERDP_API BOOL freerdp_abort_connect(freerdp* instance));
#endif
@@ -577,7 +577,7 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_abort_connect_context(rdpContext* context);
FREERDP_API HANDLE freerdp_abort_event(rdpContext* context);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_shall_disconnect_context instead",
FREERDP_API BOOL freerdp_shall_disconnect(freerdp* instance));
#endif
@@ -595,7 +595,7 @@ owned by rdpRdp */
*/
FREERDP_API const char* freerdp_disconnect_reason_string(int reason);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("use freerdp_disconnect_before_reconnect_context instead",
FREERDP_API BOOL freerdp_disconnect_before_reconnect(freerdp* instance));
#endif

2
include/freerdp/locale/keyboard.h
View File

@@ -262,7 +262,7 @@ FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardL
*/
FREERDP_API DWORD freerdp_keyboard_get_layout_id_from_name(const char* name);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("since 3.11.0, implement yourself in client",
FREERDP_API DWORD freerdp_keyboard_init(DWORD keyboardLayoutId));

2
include/freerdp/server/proxy/proxy_config.h
View File

@@ -86,7 +86,7 @@ extern "C"
size_t InterceptCount;
/* clipboard specific settings */
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", BOOL TextOnly);
WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", UINT32 MaxTextLength);

4
include/freerdp/server/shadow.h
View File

@@ -303,7 +303,7 @@ extern "C"
FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR(
"[since 3.4.0] Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data(
@@ -349,7 +349,7 @@ extern "C"
FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip);
#if defined(WITH_FREERDP_3x_DEPRECATED)
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
WINPR_DEPRECATED_VAR("[since 3.4.0] Use shadow_capture_compare_with_format",
FREERDP_API int shadow_capture_compare(
const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,