github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,timezone] outside definition timezone file

Browse Source 
allow defining the filepath of timezone file in buildsystem adjusting it
without a required code change.
This commit is contained in:
akallabeth 2024-03-19 09:52:39 +01:00 committed by akallabeth
parent f4b7c59915
commit 92ed8b3916
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/PlatformDefaults.cmake
View File

@ -4,17 +4,17 @@ if((CMAKE_SYSTEM_NAME MATCHES "WindowsStore") AND (CMAKE_SYSTEM_VERSION MATCHES
add_definitions("-D_UWP") add_definitions("-D_UWP")
set(CMAKE_WINDOWS_VERSION "WIN10" CACHE STRING "platform default") set(CMAKE_WINDOWS_VERSION "WIN10" CACHE STRING "platform default")
endif() endif()
# Enable 64bit file support on linux and FreeBSD.
if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
add_definitions("-D_FILE_OFFSET_BITS=64") add_definitions("-D_FILE_OFFSET_BITS=64")
add_definitions("-DWINPR_TIMEZONE_FILE=\"/etc/timezone\"")
endif() endif()
if("${CMAKE_SYSTEM_NAME}" MATCHES FREEBSD) if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
add_definitions("-D_FILE_OFFSET_BITS=64") add_definitions("-D_FILE_OFFSET_BITS=64")
add_definitions("-DWINPR_TIMEZONE_FILE=\"/var/db/zoneinfo\"")
endif() endif()
# Use Standard conforming getpwnam_r() on Solaris.
# Use Standard conforming getpwnam_r() on Solaris.
if("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") if("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
add_definitions("-D_POSIX_PTHREAD_SEMANTICS") add_definitions("-D_POSIX_PTHREAD_SEMANTICS")
list(APPEND CMAKE_STANDARD_LIBRARIES rt) list(APPEND CMAKE_STANDARD_LIBRARIES rt)

7
winpr/libwinpr/timezone/timezone.c
View File

@ -247,10 +247,11 @@ static char* winpr_get_unix_timezone_identifier_from_file(void)
#else #else
FILE* fp = NULL; FILE* fp = NULL;
char* tzid = NULL; char* tzid = NULL;
#if defined(__FreeBSD__) || defined(__OpenBSD__) #if !defined(WINPR_TIMEZONE_FILE)
fp = winpr_fopen("/var/db/zoneinfo", "r"); #error \
"Please define WINPR_TIMEZONE_FILE with the path to your timezone file (e.g. /etc/timezone or similar)"
#else #else
fp = winpr_fopen("/etc/timezone", "r"); fp = winpr_fopen(WINPR_TIMEZONE_FILE, "r");
#endif #endif
if (NULL == fp) if (NULL == fp)