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

Revert "[freerdp,codecs] fix deprecation for GCC"

Browse Source 
This reverts commit 67fabc34dc.

The change eliminates the deprecation warnings but produces
Wredundant-decl warnings instead...
This commit is contained in:
akallabeth
2025-04-03 09:50:34 +02:00
parent 85523ac7d4
commit da7fefba11
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/SDL/SDL3/sdl_freerdp.cpp
View File

@@ -1790,14 +1790,14 @@ SdlContext::SdlContext(rdpContext* context)
WINPR_ASSERT(context);
}
bool SdlContext::redraw(bool suppress)
bool SdlContext::redraw(bool suppress) const
{
if (!connected)
return true;
auto gdi = context()->gdi;
WINPR_ASSERT(gdi);
return gdi_send_suppress_output(gdi, suppress ? TRUE : FALSE);
return gdi_send_suppress_output(gdi, suppress);
}
void SdlContext::setConnected(bool val)

5
client/SDL/SDL3/sdl_freerdp.hpp
View File

@@ -54,8 +54,7 @@ class SdlContext
SdlContext& operator=(const SdlContext& other) = delete;
SdlContext& operator=(SdlContext&& other) = delete;
public:
[[nodiscard]] bool redraw(bool suppress = false);
[[nodiscard]] bool redraw(bool suppress = false) const;
void setConnected(bool val);
[[nodiscard]] bool isConnected() const;
@@ -69,6 +68,7 @@ class SdlContext
private:
rdpContext* _context;
std::atomic<bool> connected = false;
public:
wLog* log;
@@ -100,5 +100,4 @@ class SdlContext
std::unique_ptr<SDLConnectionDialog> connection_dialog;
std::atomic<bool> rdp_thread_running;
std::atomic<bool> connected = false;
};

6
include/freerdp/codecs.h
View File

@@ -87,12 +87,12 @@ extern "C"
FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags);
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
FREERDP_API void codecs_free(rdpCodecs* codecs);
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
FREERDP_API void codecs_free(rdpCodecs* codecs));
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_new",
WINPR_ATTR_MALLOC(codecs_free, 1)
FREERDP_API rdpCodecs* codecs_new(rdpContext* context));
WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
FREERDP_API void codecs_free(rdpCodecs* codecs));
#endif
#ifdef __cplusplus