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/event.c | |
| parent | daa9ef0efeb5e10a1b43820fbab3a4ff5fbd22f1 (diff) | |
| parent | 20c8675ba46bda97330a4117c459a59a9f1c465e (diff) | |
Merge tag 'upstream/2.4_beta1'
Upstream version 2.4~beta1
Diffstat (limited to 'src/openvpn/event.c')
| -rw-r--r-- | src/openvpn/event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/event.c b/src/openvpn/event.c index c642691..409ad13 100644 --- a/src/openvpn/event.c +++ b/src/openvpn/event.c @@ -49,7 +49,7 @@ /* * All non-windows OSes are assumed to have select() */ -#ifdef WIN32 +#ifdef _WIN32 #define SELECT 0 #else #define SELECT 1 @@ -74,7 +74,7 @@ tv_to_ms_timeout (const struct timeval *tv) return max_int (tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000, 1); } -#ifdef WIN32 +#ifdef _WIN32 struct we_set { @@ -462,7 +462,7 @@ we_init (int *maxevents, unsigned int flags) return (struct event_set *) wes; } -#endif /* WIN32 */ +#endif /* _WIN32 */ #if EPOLL @@ -1007,7 +1007,7 @@ static struct event_set * event_set_init_simple (int *maxevents, unsigned int flags) { struct event_set *ret = NULL; -#ifdef WIN32 +#ifdef _WIN32 ret = we_init (maxevents, flags); #elif POLL && SELECT #if 0 /* Define to 1 if EVENT_METHOD_US_TIMEOUT should cause select to be favored over poll */ |