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

[freerdp] use FREERDP_/UWAC_/RDTK_ prefix for conditional headers

Browse Source
This commit is contained in:
akallabeth 2023-01-10 14:47:16 +01:00 committed by akallabeth
parent 92d3e3c64a
commit 82ba9ede9c
23 changed files with 39 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -550,9 +550,9 @@ if(ANDROID)
endif() endif()
if(WITH_VALGRIND_MEMCHECK) if(WITH_VALGRIND_MEMCHECK)
check_include_files(valgrind/memcheck.h HAVE_VALGRIND_MEMCHECK_H) check_include_files(valgrind/memcheck.h FREERDP_HAVE_VALGRIND_MEMCHECK_H)
else() else()
unset(HAVE_VALGRIND_MEMCHECK_H CACHE) unset(FREERDP_HAVE_VALGRIND_MEMCHECK_H CACHE)
endif() endif()
if(UNIX OR CYGWIN) if(UNIX OR CYGWIN)
@ -698,9 +698,9 @@ if(UNIX AND NOT ANDROID)
find_feature(libsystemd ${WLOG_SYSTEMD_JOURNAL_FEATURE_TYPE} ${WLOG_SYSTEMD_JOURNAL_FEATURE_PURPOSE} ${WLOG_SYSTEMD_JOURNAL_FEATURE_DESCRIPTION}) find_feature(libsystemd ${WLOG_SYSTEMD_JOURNAL_FEATURE_TYPE} ${WLOG_SYSTEMD_JOURNAL_FEATURE_PURPOSE} ${WLOG_SYSTEMD_JOURNAL_FEATURE_DESCRIPTION})
if(LIBSYSTEMD_FOUND) if(LIBSYSTEMD_FOUND)
set(HAVE_JOURNALD_H TRUE) set(WINPR_HAVE_JOURNALD_H TRUE)
else() else()
unset(HAVE_JOURNALD_H) unset(WINPR_HAVE_JOURNALD_H)
endif() endif()
endif(UNIX AND NOT ANDROID) endif(UNIX AND NOT ANDROID)
@ -969,7 +969,7 @@ endif()
set(FREERDP_BUILD_CONFIG_LIST "") set(FREERDP_BUILD_CONFIG_LIST "")
GET_CMAKE_PROPERTY(res VARIABLES) GET_CMAKE_PROPERTY(res VARIABLES)
FOREACH(var ${res}) FOREACH(var ${res})
IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") IF (var MATCHES "^WITH_*|^BUILD_TESTING|^WINPR_HAVE_*")
LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}") LIST(APPEND FREERDP_BUILD_CONFIG_LIST "${var}=${${var}}")
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()

4
channels/parallel/client/parallel_main.c
View File

@ -26,10 +26,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>

4
channels/rdpdr/client/rdpdr_main.c
View File

@ -60,10 +60,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "rdpdr_capabilities.h" #include "rdpdr_capabilities.h"
#include "devman.h" #include "devman.h"

4
channels/tsmf/client/tsmf_media.c
View File

@ -27,10 +27,6 @@
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifndef _WIN32 #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#endif #endif

4
client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c
View File

@ -19,10 +19,6 @@
#define TAG CLIENT_TAG("android") #define TAG CLIENT_TAG("android")
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "android_freerdp.h" #include "android_freerdp.h"
#include "android_cliprdr.h" #include "android_cliprdr.h"

4
client/common/file.c
View File

@ -46,10 +46,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/path.h> #include <winpr/path.h>

4
include/config/config.h.in
View File

@ -4,9 +4,7 @@
#include <winpr/config.h> #include <winpr/config.h>
/* Include files */ /* Include files */
#cmakedefine HAVE_SYSLOG_H #cmakedefine FREERDP_HAVE_VALGRIND_MEMCHECK_H
#cmakedefine HAVE_JOURNALD_H
#cmakedefine HAVE_VALGRIND_MEMCHECK_H
/* Features */ /* Features */
#cmakedefine SWRESAMPLE_FOUND #cmakedefine SWRESAMPLE_FOUND

4
libfreerdp/core/gateway/http.c
View File

@ -31,7 +31,7 @@
/* websocket need sha1 for Sec-Websocket-Accept */ /* websocket need sha1 for Sec-Websocket-Accept */
#include <winpr/crypto.h> #include <winpr/crypto.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#endif #endif
@ -853,7 +853,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength)
continue; continue;
} }
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
VALGRIND_MAKE_MEM_DEFINED(Stream_Pointer(response->data), status); VALGRIND_MAKE_MEM_DEFINED(Stream_Pointer(response->data), status);
#endif #endif
Stream_Seek(response->data, (size_t)status); Stream_Seek(response->data, (size_t)status);

2
libfreerdp/core/gateway/rpc.c
View File

@ -32,7 +32,7 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#endif #endif

4
libfreerdp/core/settings.c
View File

@ -22,10 +22,6 @@
#include "certificate.h" #include "certificate.h"
#include "capabilities.h" #include "capabilities.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <winpr/crt.h> #include <winpr/crt.h>

6
libfreerdp/core/tcp.c
View File

@ -43,7 +43,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef HAVE_POLL_H #ifdef WINPR_HAVE_POLL_H
#include <poll.h> #include <poll.h>
#else #else
#include <time.h> #include <time.h>
@ -227,7 +227,7 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
{ {
int timeout = (int)arg1; int timeout = (int)arg1;
int sockfd = (int)ptr->socket; int sockfd = (int)ptr->socket;
#ifdef HAVE_POLL_H #ifdef WINPR_HAVE_POLL_H
struct pollfd pollset; struct pollfd pollset;
pollset.fd = sockfd; pollset.fd = sockfd;
pollset.events = POLLIN; pollset.events = POLLIN;
@ -262,7 +262,7 @@ static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
{ {
int timeout = (int)arg1; int timeout = (int)arg1;
int sockfd = (int)ptr->socket; int sockfd = (int)ptr->socket;
#ifdef HAVE_POLL_H #ifdef WINPR_HAVE_POLL_H
struct pollfd pollset; struct pollfd pollset;
pollset.fd = sockfd; pollset.fd = sockfd;
pollset.events = POLLOUT; pollset.events = POLLOUT;

4
libfreerdp/core/transport.c
View File

@ -42,7 +42,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#endif #endif
@ -635,7 +635,7 @@ static SSIZE_T transport_read_layer(rdpTransport* transport, BYTE* data, size_t
continue; continue;
} }
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
VALGRIND_MAKE_MEM_DEFINED(data + read, bytes - read); VALGRIND_MAKE_MEM_DEFINED(data + read, bytes - read);
#endif #endif
read += status; read += status;

6
libfreerdp/crypto/tls.c
View File

@ -36,11 +36,11 @@
#include "../core/tcp.h" #include "../core/tcp.h"
#include "opensslcompat.h" #include "opensslcompat.h"
#ifdef HAVE_POLL_H #ifdef WINPR_HAVE_POLL_H
#include <poll.h> #include <poll.h>
#endif #endif
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#endif #endif
@ -195,7 +195,7 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int size)
} }
} }
#ifdef HAVE_VALGRIND_MEMCHECK_H #ifdef FREERDP_HAVE_VALGRIND_MEMCHECK_H
if (status > 0) if (status > 0)
{ {

4
libfreerdp/primitives/test/prim_test.c
View File

@ -26,10 +26,6 @@
#include <winpr/platform.h> #include <winpr/platform.h>
#include <winpr/crypto.h> #include <winpr/crypto.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
primitives_t* generic = NULL; primitives_t* generic = NULL;
primitives_t* optimized = NULL; primitives_t* optimized = NULL;
BOOL g_TestPrimitivesPerformance = FALSE; BOOL g_TestPrimitivesPerformance = FALSE;

6
rdtk/CMakeLists.txt
View File

@ -82,12 +82,10 @@ include (SetFreeRDPCMakeInstallDir)
add_definitions(-DRDTK_EXPORTS) add_definitions(-DRDTK_EXPORTS)
if (NOT IOS) if (NOT IOS)
check_include_files(stdbool.h HAVE_STDBOOL_H) check_include_files(stdbool.h RDTK_HAVE_STDBOOL_H)
if (NOT HAVE_STDBOOL_H) if (NOT RDTK_HAVE_STDBOOL_H)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool)
endif() endif()
else()
set(HAVE_STDBOOL_H 1)
endif() endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

2
rdtk/templates/CMakeLists.txt
View File

@ -18,7 +18,7 @@ write_basic_package_version_file(
set(RDTK_BUILD_CONFIG_LIST "") set(RDTK_BUILD_CONFIG_LIST "")
GET_CMAKE_PROPERTY(res VARIABLES) GET_CMAKE_PROPERTY(res VARIABLES)
FOREACH(var ${res}) FOREACH(var ${res})
IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") IF (var MATCHES "^WITH_*|^BUILD_TESTING|^RDTK_HAVE_*")
LIST(APPEND RDTK_BUILD_CONFIG_LIST "${var}=${${var}}") LIST(APPEND RDTK_BUILD_CONFIG_LIST "${var}=${${var}}")
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()

10
uwac/CMakeLists.txt
View File

@ -52,7 +52,7 @@ if (NOT FREERDP_UNIFIED_BUILD)
endif() endif()
endif() endif()
option(HAVE_PIXMAN_REGION "Use PIXMAN or FreeRDP for region calculations" "NOT FREERDP_UNIFIED_BUILD") option(UWAC_HAVE_PIXMAN_REGION "Use PIXMAN or FreeRDP for region calculations" "NOT FREERDP_UNIFIED_BUILD")
# Include our extra modules # Include our extra modules
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/)
@ -69,16 +69,14 @@ endif()
if (NOT IOS) if (NOT IOS)
include(CheckIncludeFiles) include(CheckIncludeFiles)
check_include_files(stdbool.h WINPR_HAVE_STDBOOL_H) check_include_files(stdbool.h UWAC_HAVE_STDBOOL_H)
if (NOT WINPR_HAVE_STDBOOL_H) if (NOT UWAC_HAVE_STDBOOL_H)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool)
endif() endif()
else()
set(WINPR_HAVE_STDBOOL_H 1)
endif() endif()
# Find required libraries # Find required libraries
if (HAVE_PIXMAN_REGION) if (UWAC_HAVE_PIXMAN_REGION)
include(FindPkgConfig) include(FindPkgConfig)
pkg_check_modules(pixman REQUIRED pixman-1) pkg_check_modules(pixman REQUIRED pixman-1)
include_directories(${pixman_INCLUDE_DIRS}) include_directories(${pixman_INCLUDE_DIRS})

2
uwac/libuwac/CMakeLists.txt
View File

@ -78,7 +78,7 @@ if (WITH_LIBRARY_VERSIONING)
endif() endif()
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} PRIVATE ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS}) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} PRIVATE ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} ${EPOLLSHIM_LIBS})
if (HAVE_PIXMAN_REGION) if (UWAC_HAVE_PIXMAN_REGION)
target_link_libraries(${MODULE_NAME} PRIVATE ${pixman_LINK_LIBRARIES}) target_link_libraries(${MODULE_NAME} PRIVATE ${pixman_LINK_LIBRARIES})
else() else()
target_link_libraries(${MODULE_NAME} PRIVATE freerdp) target_link_libraries(${MODULE_NAME} PRIVATE freerdp)

4
uwac/libuwac/uwac-os.c
View File

@ -184,7 +184,7 @@ static int create_tmpfile_cloexec(char* tmpname)
int fd; int fd;
#ifdef USE_SHM #ifdef USE_SHM
fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600); fd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
#elif defined(HAVE_MKOSTEMP) #elif defined(UWAC_HAVE_MKOSTEMP)
fd = mkostemp(tmpname, O_CLOEXEC); fd = mkostemp(tmpname, O_CLOEXEC);
if (fd >= 0) if (fd >= 0)
@ -267,7 +267,7 @@ int uwac_create_anonymous_file(off_t size)
if (fd < 0) if (fd < 0)
return -1; return -1;
#ifdef HAVE_POSIX_FALLOCATE #ifdef UWAC_HAVE_POSIX_FALLOCATE
ret = posix_fallocate(fd, 0, size); ret = posix_fallocate(fd, 0, size);
if (ret != 0) if (ret != 0)

4
uwac/libuwac/uwac-priv.h
View File

@ -39,7 +39,7 @@
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#endif #endif
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
#include <pixman-1/pixman.h> #include <pixman-1/pixman.h>
#else #else
#include <freerdp/codec/region.h> #include <freerdp/codec/region.h>
@ -218,7 +218,7 @@ struct uwac_buffer
{ {
bool used; bool used;
bool dirty; bool dirty;
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
pixman_region32_t damage; pixman_region32_t damage;
#else #else
REGION16 damage; REGION16 damage;

8
uwac/libuwac/uwac-window.c
View File

@ -63,7 +63,7 @@ static void UwacWindowDestroyBuffers(UwacWindow* w)
for (i = 0; i < w->nbuffers; i++) for (i = 0; i < w->nbuffers; i++)
{ {
UwacBuffer* buffer = &w->buffers[i]; UwacBuffer* buffer = &w->buffers[i];
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
pixman_region32_fini(&buffer->damage); pixman_region32_fini(&buffer->damage);
#else #else
region16_uninit(&buffer->damage); region16_uninit(&buffer->damage);
@ -351,7 +351,7 @@ int UwacWindowShmAllocBuffers(UwacWindow* w, int nbuffers, int allocSize, uint32
{ {
int bufferIdx = w->nbuffers + i; int bufferIdx = w->nbuffers + i;
UwacBuffer* buffer = &w->buffers[bufferIdx]; UwacBuffer* buffer = &w->buffers[bufferIdx];
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
pixman_region32_init(&buffer->damage); pixman_region32_init(&buffer->damage);
#else #else
region16_init(&buffer->damage); region16_init(&buffer->damage);
@ -654,7 +654,7 @@ static void frame_done_cb(void* data, struct wl_callback* callback, uint32_t tim
static const struct wl_callback_listener frame_listener = { frame_done_cb }; static const struct wl_callback_listener frame_listener = { frame_done_cb };
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
static void damage_surface(UwacWindow* window, UwacBuffer* buffer) static void damage_surface(UwacWindow* window, UwacBuffer* buffer)
{ {
int nrects, i; int nrects, i;
@ -705,7 +705,7 @@ static void frame_done_cb(void* data, struct wl_callback* callback, uint32_t tim
event->window = window; event->window = window;
} }
#ifdef HAVE_PIXMAN_REGION #ifdef UWAC_HAVE_PIXMAN_REGION
UwacReturnCode UwacWindowAddDamage(UwacWindow* window, uint32_t x, uint32_t y, uint32_t width, UwacReturnCode UwacWindowAddDamage(UwacWindow* window, uint32_t x, uint32_t y, uint32_t width,
uint32_t height) uint32_t height)
{ {

2
uwac/templates/CMakeLists.txt
View File

@ -25,7 +25,7 @@ install(EXPORT uwac DESTINATION ${UWAC_CMAKE_INSTALL_DIR})
set(UWAC_BUILD_CONFIG_LIST "") set(UWAC_BUILD_CONFIG_LIST "")
GET_CMAKE_PROPERTY(res VARIABLES) GET_CMAKE_PROPERTY(res VARIABLES)
FOREACH(var ${res}) FOREACH(var ${res})
IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*") IF (var MATCHES "^WITH_*|^BUILD_TESTING|^UWAC_HAVE_*")
LIST(APPEND UWAC_BUILD_CONFIG_LIST "${var}=${${var}}") LIST(APPEND UWAC_BUILD_CONFIG_LIST "${var}=${${var}}")
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()

10
uwac/templates/config.h.in
View File

@ -2,10 +2,10 @@
#define UWAC_CONFIG_H #define UWAC_CONFIG_H
/* Include files */ /* Include files */
#cmakedefine HAVE_TM_GMTOFF #cmakedefine UWAC_HAVE_TM_GMTOFF
#cmakedefine HAVE_POLL_H #cmakedefine UWAC_HAVE_POLL_H
#cmakedefine HAVE_SYSLOG_H #cmakedefine UWAC_HAVE_SYSLOG_H
#cmakedefine HAVE_JOURNALD_H #cmakedefine UWAC_HAVE_JOURNALD_H
#cmakedefine HAVE_PIXMAN_REGION #cmakedefine UWAC_HAVE_PIXMAN_REGION
#endif /* UWAC_CONFIG_H */ #endif /* UWAC_CONFIG_H */