aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2018-10-07 21:46:56 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2018-10-09 08:33:45 +0200
commit940e1c1e743e376ddd47f2e2bd963c82d8dc5f59 (patch)
tree19cb42ba5a9fbb032255d171ad629f0987405531 /lib
parent6450a55721a9c0eda97e83cf014106392d15c1b6 (diff)
Windows: fixes for MinGW targeting Windows Vista
Classic MinGW has neither InitializeCriticalSectionEx nor GetTickCount64, independent of the target Windows version. Closes https://github.com/curl/curl/pull/3113
Diffstat (limited to 'lib')
-rw-r--r--lib/curl_threads.h3
-rw-r--r--lib/timeval.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/curl_threads.h b/lib/curl_threads.h
index 9e0d14a30..2a93644c5 100644
--- a/lib/curl_threads.h
+++ b/lib/curl_threads.h
@@ -38,7 +38,8 @@
# define curl_thread_t HANDLE
# define curl_thread_t_null (HANDLE)0
# if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \
- (_WIN32_WINNT < _WIN32_WINNT_VISTA)
+ (_WIN32_WINNT < _WIN32_WINNT_VISTA) || \
+ (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
# define Curl_mutex_init(m) InitializeCriticalSection(m)
# else
# define Curl_mutex_init(m) InitializeCriticalSectionEx(m, 0, 1)
diff --git a/lib/timeval.c b/lib/timeval.c
index bcb571a7c..dce1a761e 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -33,7 +33,8 @@ struct curltime Curl_now(void)
*/
struct curltime now;
#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \
- (_WIN32_WINNT < _WIN32_WINNT_VISTA)
+ (_WIN32_WINNT < _WIN32_WINNT_VISTA) || \
+ (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
DWORD milliseconds = GetTickCount();
now.tv_sec = milliseconds / 1000;
now.tv_usec = (milliseconds % 1000) * 1000;