From fd08c77f7f92717226743642dbf7bd0592db37eb Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 28 Jun 2021 09:27:21 +0200 Subject: [PATCH] Fixed definition of config.h symbols --- CMakeLists.txt | 15 --------------- config.h.in | 10 ---------- libfreerdp/core/tcp.c | 4 ---- uwac/templates/config.h.in | 17 ----------------- winpr/CMakeLists.txt | 9 +++++++-- winpr/config.h.in | 4 ++-- 6 files changed, 9 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eab8d8edd..a6529995b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,21 +461,12 @@ add_definitions(-DFREERDP_EXPORTS) # Include files if(NOT IOS) - check_include_files(fcntl.h HAVE_FCNTL_H) check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(execinfo.h HAVE_EXECINFO_H) check_include_files(inttypes.h HAVE_INTTYPES_H) - check_include_files(sys/modem.h HAVE_SYS_MODEM_H) - check_include_files(sys/filio.h HAVE_SYS_FILIO_H) - check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H) - check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H) - check_include_files(sys/select.h HAVE_SYS_SELECT_H) - check_include_files(syslog.h HAVE_SYSLOG_H) else() - set(HAVE_FCNTL_H 1) set(HAVE_UNISTD_H 1) set(HAVE_INTTYPES_H 1) - set(HAVE_SYS_FILIO_H 1) endif() if(NOT IOS) @@ -576,15 +567,9 @@ else() endif() if(UNIX OR CYGWIN) - check_include_files(aio.h HAVE_AIO_H) - check_include_files(sys/eventfd.h HAVE_SYS_EVENTFD_H) - if (HAVE_SYS_EVENTFD_H) - check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE) - endif() if (FREEBSD) list(APPEND CMAKE_REQUIRED_INCLUDES ${EPOLLSHIM_INCLUDE_DIR}) endif() - check_include_files(sys/timerfd.h HAVE_SYS_TIMERFD_H) if (FREEBSD) list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES ${EPOLLSHIM_INCLUDE_DIR}) endif() diff --git a/config.h.in b/config.h.in index ec05d38d8..65739cbac 100644 --- a/config.h.in +++ b/config.h.in @@ -2,22 +2,13 @@ #define FREERDP_CONFIG_H /* Include files */ -#cmakedefine HAVE_FCNTL_H #if defined(__APPLE__) && !defined(__IOS__) #cmakedefine01 HAVE_UNISTD_H #else #cmakedefine HAVE_UNISTD_H #endif #cmakedefine HAVE_INTTYPES_H -#cmakedefine HAVE_SYS_MODEM_H -#cmakedefine HAVE_SYS_FILIO_H -#cmakedefine HAVE_SYS_SELECT_H -#cmakedefine HAVE_SYS_SOCKIO_H -#cmakedefine HAVE_SYS_STRTIO_H -#cmakedefine HAVE_SYS_EVENTFD_H -#cmakedefine HAVE_SYS_TIMERFD_H #cmakedefine HAVE_TM_GMTOFF -#cmakedefine HAVE_AIO_H #cmakedefine HAVE_POLL_H #cmakedefine HAVE_SYSLOG_H #cmakedefine HAVE_JOURNALD_H @@ -43,7 +34,6 @@ #cmakedefine WITH_WIN8 #cmakedefine WITH_ICU #cmakedefine WITH_RDPSND_DSOUND -#cmakedefine WITH_EVENTFD_READ_WRITE #cmakedefine HAVE_MATH_C99_LONG_DOUBLE #cmakedefine WITH_WINMM diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 7313a1195..8aed13c59 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -51,10 +51,6 @@ #include #endif -#ifdef HAVE_SYS_FILIO_H -#include -#endif - #if defined(__FreeBSD__) || defined(__OpenBSD__) #ifndef SOL_TCP #define SOL_TCP IPPROTO_TCP diff --git a/uwac/templates/config.h.in b/uwac/templates/config.h.in index 96a53a55f..d828a05a0 100644 --- a/uwac/templates/config.h.in +++ b/uwac/templates/config.h.in @@ -2,28 +2,11 @@ #define UWAC_CONFIG_H /* Include files */ -#cmakedefine HAVE_FCNTL_H -#if defined(__APPLE__) && !defined(__IOS__) -#cmakedefine01 HAVE_UNISTD_H -#else -#cmakedefine HAVE_UNISTD_H -#endif -#cmakedefine HAVE_INTTYPES_H -#cmakedefine HAVE_SYS_MODEM_H -#cmakedefine HAVE_SYS_FILIO_H -#cmakedefine HAVE_SYS_SELECT_H -#cmakedefine HAVE_SYS_SOCKIO_H -#cmakedefine HAVE_SYS_STRTIO_H -#cmakedefine HAVE_SYS_EVENTFD_H -#cmakedefine HAVE_SYS_TIMERFD_H #cmakedefine HAVE_TM_GMTOFF -#cmakedefine HAVE_AIO_H #cmakedefine HAVE_POLL_H #cmakedefine HAVE_SYSLOG_H #cmakedefine HAVE_JOURNALD_H #cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK -#cmakedefine HAVE_VALGRIND_MEMCHECK_H -#cmakedefine HAVE_EXECINFO_H #cmakedefine HAVE_GETLOGIN_R #cmakedefine HAVE_STRNDUP #cmakedefine HAVE_PIXMAN_REGION diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 39931c660..878617498 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -124,14 +124,19 @@ endif() # Include files if(NOT IOS) check_include_files(fcntl.h HAVE_FCNTL_H) + check_include_files(aio.h HAVE_AIO_H) + check_include_files(sys/timerfd.h HAVE_SYS_TIMERFD_H) check_include_files(unistd.h HAVE_UNISTD_H) - check_include_files(execinfo.h HAVE_EXECINFO_H) check_include_files(inttypes.h HAVE_INTTYPES_H) - check_include_files(sys/modem.h HAVE_SYS_MODEM_H) check_include_files(sys/filio.h HAVE_SYS_FILIO_H) check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H) check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H) + check_include_files(syslog.h HAVE_SYSLOG_H) check_include_files(sys/select.h HAVE_SYS_SELECT_H) + check_include_files(sys/eventfd.h HAVE_SYS_EVENTFD_H) + if (HAVE_SYS_EVENTFD_H) + check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE) + endif() else() set(HAVE_FCNTL_H 1) set(HAVE_UNISTD_H 1) diff --git a/winpr/config.h.in b/winpr/config.h.in index af42bb23b..616e12533 100644 --- a/winpr/config.h.in +++ b/winpr/config.h.in @@ -9,7 +9,7 @@ #cmakedefine HAVE_UNISTD_H #endif #cmakedefine HAVE_INTTYPES_H -#cmakedefine HAVE_SYS_MODEM_H +#cmakedefine HAVE_AIO_H #cmakedefine HAVE_SYS_FILIO_H #cmakedefine HAVE_SYS_SELECT_H #cmakedefine HAVE_SYS_SOCKIO_H @@ -22,9 +22,9 @@ #cmakedefine HAVE_SYSLOG_H #cmakedefine HAVE_JOURNALD_H #cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK -#cmakedefine HAVE_VALGRIND_MEMCHECK_H #cmakedefine HAVE_EXECINFO_H #cmakedefine HAVE_GETLOGIN_R #cmakedefine HAVE_STRNDUP +#cmakedefine WITH_EVENTFD_READ_WRITE #endif /* WINPR_CONFIG_H */