diff --git a/include/freerdp/utils/time.h b/include/freerdp/utils/time.h deleted file mode 100644 index d41b32bb9..000000000 --- a/include/freerdp/utils/time.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * FreeRDP: A Remote Desktop Protocol Implementation - * Time Utils - * - * Copyright 2012 Marc-Andre Moreau - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FREERDP_UTILS_TIME_H -#define FREERDP_UTILS_TIME_H - -#define __USE_XOPEN -#include - -#ifndef _WIN32 -#include -#endif - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -FREERDP_API UINT64 freerdp_windows_gmtime(void); -FREERDP_API UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time); -FREERDP_API time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time); - -#ifdef __cplusplus -} -#endif - -#endif /* FREERDP_TIME_UTILS_H */ diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c index ead84324d..92b74e812 100644 --- a/libfreerdp/locale/timezone.c +++ b/libfreerdp/locale/timezone.c @@ -21,17 +21,18 @@ #include "config.h" #endif -#include -#include -#include -#include - #include +#define __USE_XOPEN +#include + +#ifndef _WIN32 +#include +#endif + #include "liblocale.h" #include -#include #include #define TAG FREERDP_TAG("locale") @@ -1491,6 +1492,17 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { "Yakutsk Standard Time", "Asia/Yakutsk" } }; +static UINT64 freerdp_windows_gmtime() +{ + time_t unix_time; + UINT64 windows_time; + + time(&unix_time); + windows_time = ((UINT64) unix_time * 10000000) + 621355968000000000ULL; + + return windows_time; +} + char* freerdp_get_unix_timezone_identifier() { #ifndef _WIN32 diff --git a/libfreerdp/utils/CMakeLists.txt b/libfreerdp/utils/CMakeLists.txt index 9fda38f89..d7d6a69ed 100644 --- a/libfreerdp/utils/CMakeLists.txt +++ b/libfreerdp/utils/CMakeLists.txt @@ -26,7 +26,6 @@ set(${MODULE_PREFIX}_SRCS signal.c stopwatch.c tcp.c - time.c uds.c) if(NOT WIN32) diff --git a/libfreerdp/utils/time.c b/libfreerdp/utils/time.c deleted file mode 100644 index 31b51564f..000000000 --- a/libfreerdp/utils/time.c +++ /dev/null @@ -1,55 +0,0 @@ -/** - * FreeRDP: A Remote Desktop Protocol Implementation - * Time Utils - * - * Copyright 2012 Marc-Andre Moreau - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -#include - -#include - -UINT64 freerdp_windows_gmtime() -{ - time_t unix_time; - UINT64 windows_time; - - time(&unix_time); - windows_time = freerdp_get_windows_time_from_unix_time(unix_time); - - return windows_time; -} - -UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time) -{ - UINT64 windows_time; - windows_time = ((UINT64)unix_time * 10000000) + 621355968000000000ULL; - return windows_time; -} - -time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time) -{ - time_t unix_time; - unix_time = (windows_time - 621355968000000000ULL) / 10000000; - return unix_time; -}