diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
| commit | 93b77cacdbb7e6f310c4e20f85c3a24ed5ba18ba (patch) | |
| tree | 55a7688c9969ef4d01625caa58c7f679098c76eb /src/openvpn/otime.h | |
| parent | daa9ef0efeb5e10a1b43820fbab3a4ff5fbd22f1 (diff) | |
| parent | 20c8675ba46bda97330a4117c459a59a9f1c465e (diff) | |
Merge tag 'upstream/2.4_beta1'
Upstream version 2.4~beta1
Diffstat (limited to 'src/openvpn/otime.h')
| -rw-r--r-- | src/openvpn/otime.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/otime.h b/src/openvpn/otime.h index 4ca1032..c0b0f38 100644 --- a/src/openvpn/otime.h +++ b/src/openvpn/otime.h @@ -76,8 +76,8 @@ openvpn_gettimeofday (struct timeval *tv, void *tz) static inline void update_time (void) { -#ifdef WIN32 - /* on WIN32, gettimeofday is faster than time(NULL) */ +#ifdef _WIN32 + /* on _WIN32, gettimeofday is faster than time(NULL) */ struct timeval tv; openvpn_gettimeofday (&tv, NULL); #else @@ -90,8 +90,8 @@ update_time (void) static inline void update_time (void) { -#if defined(WIN32) - /* on WIN32, gettimeofday is faster than time(NULL) */ +#if defined(_WIN32) + /* on _WIN32, gettimeofday is faster than time(NULL) */ struct timeval tv; if (!gettimeofday (&tv, NULL)) { |