From: Nick Mathewson Date: Wed, 25 May 2011 23:50:56 +0000 (-0400) Subject: Use "_WIN32", not WIN32: it's standard and we don't need to fake it X-Git-Tag: release-2.1.1-alpha~272 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f560bfa114b8216af2dac28966eae53c0c97ed3;p=libevent Use "_WIN32", not WIN32: it's standard and we don't need to fake it This patch was automatically generated with perl. Based on a patch by Peter Rosin. --- diff --git a/arc4random.c b/arc4random.c index de93d6e4..254c12b6 100644 --- a/arc4random.c +++ b/arc4random.c @@ -50,7 +50,7 @@ #ifndef ARC4RANDOM_NO_INCLUDES #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #else @@ -79,7 +79,7 @@ struct arc4_stream { unsigned char s[256]; }; -#ifdef WIN32 +#ifdef _WIN32 #define getpid _getpid #define pid_t int #endif @@ -120,7 +120,7 @@ arc4_addrandom(const unsigned char *dat, int datlen) rs.j = rs.i; } -#ifndef WIN32 +#ifndef _WIN32 static ssize_t read_all(int fd, unsigned char *buf, size_t count) { @@ -140,7 +140,7 @@ read_all(int fd, unsigned char *buf, size_t count) } #endif -#ifdef WIN32 +#ifdef _WIN32 #define TRY_SEED_WIN32 static int arc4_seed_win32(void) @@ -290,7 +290,7 @@ arc4_seed_proc_sys_kernel_random_uuid(void) } #endif -#ifndef WIN32 +#ifndef _WIN32 #define TRY_SEED_URANDOM static int arc4_seed_urandom(void) diff --git a/buffer.c b/buffer.c index 45138624..9d6ffc10 100644 --- a/buffer.c +++ b/buffer.c @@ -28,7 +28,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -194,7 +194,7 @@ evbuffer_chain_free(struct evbuffer_chain *chain) struct evbuffer_chain_file_segment, chain); if (info->segment) { -#ifdef WIN32 +#ifdef _WIN32 if (info->segment->type == EVBUF_FS_MMAP) UnmapViewOfFile(chain->buffer); #endif @@ -1873,7 +1873,7 @@ evbuffer_expand(struct evbuffer *buf, size_t datlen) * Reads data from a file descriptor into a buffer. */ -#if defined(_EVENT_HAVE_SYS_UIO_H) || defined(WIN32) +#if defined(_EVENT_HAVE_SYS_UIO_H) || defined(_WIN32) #define USE_IOVEC_IMPL #endif @@ -1961,7 +1961,7 @@ _evbuffer_read_setup_vecs(struct evbuffer *buf, ev_ssize_t howmuch, static int get_n_bytes_readable_on_socket(evutil_socket_t fd) { -#if defined(FIONREAD) && defined(WIN32) +#if defined(FIONREAD) && defined(_WIN32) unsigned long lng = EVBUFFER_MAX_READ; if (ioctlsocket(fd, FIONREAD, &lng) < 0) return -1; @@ -2027,7 +2027,7 @@ evbuffer_read(struct evbuffer *buf, evutil_socket_t fd, int howmuch) WSABUF_FROM_EVBUFFER_IOV(&vecs[i], &ev_vecs[i]); #endif -#ifdef WIN32 +#ifdef _WIN32 { DWORD bytesRead; DWORD flags=0; @@ -2058,7 +2058,7 @@ evbuffer_read(struct evbuffer *buf, evutil_socket_t fd, int howmuch) /* We can append new data at this point */ p = chain->buffer + chain->misalign + chain->off; -#ifndef WIN32 +#ifndef _WIN32 n = read(fd, p, howmuch); #else n = recv(fd, p, howmuch, 0); @@ -2137,7 +2137,7 @@ evbuffer_write_iovec(struct evbuffer *buffer, evutil_socket_t fd, } chain = chain->next; } -#ifdef WIN32 +#ifdef _WIN32 { DWORD bytesSent; if (WSASend(fd, iov, i, &bytesSent, 0, NULL, NULL)) @@ -2227,7 +2227,7 @@ evbuffer_write_atmost(struct evbuffer *buffer, evutil_socket_t fd, #endif #ifdef USE_IOVEC_IMPL n = evbuffer_write_iovec(buffer, fd, howmuch); -#elif defined(WIN32) +#elif defined(_WIN32) /* XXX(nickm) Don't disable this code until we know if * the WSARecv code above works. */ void *p = evbuffer_pullup(buffer, howmuch); @@ -2600,7 +2600,7 @@ evbuffer_file_segment_new( seg->fd = fd; seg->flags = flags; -#ifdef WIN32 +#ifdef _WIN32 #define lseek _lseeki64 #define fstat _fstat #define stat _stat @@ -2661,7 +2661,7 @@ evbuffer_file_segment_new( } } #endif -#ifdef WIN32 +#ifdef _WIN32 if (!(flags & EVBUF_FS_DISABLE_MMAP)) { long h = (long)_get_osfhandle(fd); HANDLE m; @@ -2742,7 +2742,7 @@ evbuffer_file_segment_free(struct evbuffer_file_segment *seg) if (seg->type == EVBUF_FS_SENDFILE) { ; } else if (seg->type == EVBUF_FS_MMAP) { -#ifdef WIN32 +#ifdef _WIN32 CloseHandle(seg->mapping_handle); #elif defined (_EVENT_HAVE_MMAP) if (munmap(seg->mapping, seg->length) == -1) @@ -2799,7 +2799,7 @@ evbuffer_add_file_segment(struct evbuffer *buf, chain->off = length; chain->buffer_len = chain->misalign + length; } else if (seg->type == EVBUF_FS_MMAP) { -#ifdef WIN32 +#ifdef _WIN32 ev_uint64_t total_offset = seg->offset+offset; ev_uint64_t offset_rounded=0, offset_remaining=0; LPVOID data; diff --git a/bufferevent-internal.h b/bufferevent-internal.h index 8d12a4e8..bbf17eba 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -260,7 +260,7 @@ extern const struct bufferevent_ops bufferevent_ops_pair; #define BEV_IS_FILTER(bevp) ((bevp)->be_ops == &bufferevent_ops_filter) #define BEV_IS_PAIR(bevp) ((bevp)->be_ops == &bufferevent_ops_pair) -#ifdef WIN32 +#ifdef _WIN32 extern const struct bufferevent_ops bufferevent_ops_async; #define BEV_IS_ASYNC(bevp) ((bevp)->be_ops == &bufferevent_ops_async) #else diff --git a/bufferevent.c b/bufferevent.c index e1e9e47d..1c064e53 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -42,7 +42,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include diff --git a/bufferevent_async.c b/bufferevent_async.c index e4fde1f6..81cc0b72 100644 --- a/bufferevent_async.c +++ b/bufferevent_async.c @@ -44,7 +44,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 2da45868..eeb9a7d3 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -44,7 +44,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index de6440e3..fcc733bf 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -44,7 +44,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/bufferevent_pair.c b/bufferevent_pair.c index bc1039b9..40fee940 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -28,7 +28,7 @@ #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 366f3896..53a1fc70 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -46,7 +46,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -71,7 +71,7 @@ #include "mm-internal.h" #include "bufferevent-internal.h" #include "util-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #include "iocp-internal.h" #endif @@ -232,7 +232,7 @@ bufferevent_writecb(evutil_socket_t fd, short event, void *arg) goto done; } else { connected = 1; -#ifdef WIN32 +#ifdef _WIN32 if (BEV_IS_ASYNC(bufev)) { event_del(&bufev->ev_write); bufferevent_async_set_connected(bufev); @@ -314,7 +314,7 @@ bufferevent_socket_new(struct event_base *base, evutil_socket_t fd, struct bufferevent_private *bufev_p; struct bufferevent *bufev; -#ifdef WIN32 +#ifdef _WIN32 if (base && event_base_get_iocp(base)) return bufferevent_async_new(base, fd, options); #endif @@ -371,7 +371,7 @@ bufferevent_socket_connect(struct bufferevent *bev, ownfd = 1; } if (sa) { -#ifdef WIN32 +#ifdef _WIN32 if (bufferevent_async_can_connect(bev)) { bufferevent_setfd(bev, fd); r = bufferevent_async_connect(bev, fd, sa, socklen); @@ -386,7 +386,7 @@ bufferevent_socket_connect(struct bufferevent *bev, if (r < 0) goto freesock; } -#ifdef WIN32 +#ifdef _WIN32 /* ConnectEx() isn't always around, even when IOCP is enabled. * Here, we borrow the socket object's write handler to fall back * on a non-blocking connect() when ConnectEx() is unavailable. */ diff --git a/compat/sys/queue.h b/compat/sys/queue.h index 53dd10d9..6a9c581b 100644 --- a/compat/sys/queue.h +++ b/compat/sys/queue.h @@ -93,7 +93,7 @@ struct name { \ #define SLIST_HEAD_INITIALIZER(head) \ { NULL } -#ifndef WIN32 +#ifndef _WIN32 #define SLIST_ENTRY(type) \ struct { \ struct type *sle_next; /* next element */ \ diff --git a/evbuffer-internal.h b/evbuffer-internal.h index 08b94b2f..6bb3e2c1 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -42,7 +42,7 @@ extern "C" { * arguments. */ #define EVBUFFER_CB_NODEFER 2 -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include @@ -126,7 +126,7 @@ struct evbuffer { * overflows when we have mutually recursive callbacks, and for * serializing callbacks in a single thread. */ unsigned deferred_cbs : 1; -#ifdef WIN32 +#ifdef _WIN32 /** True iff this buffer is set up for overlapped IO. */ unsigned is_overlapped : 1; #endif @@ -205,7 +205,7 @@ struct evbuffer_chain_reference { * evbuffer_chain with the EVBUFFER_FILESEGMENT flag set. */ struct evbuffer_chain_file_segment { struct evbuffer_file_segment *segment; -#ifdef WIN32 +#ifdef _WIN32 /** If we're using CreateFileMapping, this is the handle to the view. */ HANDLE view_handle; #endif @@ -224,7 +224,7 @@ struct evbuffer_file_segment { int fd; /** If we're using mmap, this is the raw mapped memory. */ void *mapping; -#ifdef WIN32 +#ifdef _WIN32 /** If we're using CreateFileMapping, this is the mapping */ HANDLE mapping_handle; #endif diff --git a/evdns.c b/evdns.c index a6bbcbe1..9beac911 100644 --- a/evdns.c +++ b/evdns.c @@ -61,7 +61,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #ifndef _WIN32_IE @@ -89,7 +89,7 @@ #include "ipv6-internal.h" #include "util-internal.h" #include "evthread-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -3437,7 +3437,7 @@ evdns_base_resolv_conf_parse(struct evdns_base *base, int flags, const char *con static char * evdns_get_default_hosts_filename(void) { -#ifdef WIN32 +#ifdef _WIN32 /* Windows is a little coy about where it puts its configuration * files. Sure, they're _usually_ in C:\windows\system32, but * there's no reason in principle they couldn't be in @@ -3519,7 +3519,7 @@ evdns_resolv_conf_parse(int flags, const char *const filename) { } -#ifdef WIN32 +#ifdef _WIN32 /* Add multiple nameservers from a space-or-comma-separated list. */ static int evdns_nameserver_ip_add_line(struct evdns_base *base, const char *ips) { @@ -3799,7 +3799,7 @@ evdns_base_new(struct event_base *event_base, int initialize_nameservers) if (initialize_nameservers) { int r; -#ifdef WIN32 +#ifdef _WIN32 r = evdns_base_config_windows_nameservers(base); #else r = evdns_base_resolv_conf_parse(base, DNS_OPTIONS_ALL, "/etc/resolv.conf"); diff --git a/event-internal.h b/event-internal.h index 5c6babcc..386333da 100644 --- a/event-internal.h +++ b/event-internal.h @@ -101,7 +101,7 @@ struct eventop { size_t fdinfo_len; }; -#ifdef WIN32 +#ifdef _WIN32 /* If we're on win32, then file descriptors are not nice low densely packed integers. Instead, they are pointer-like windows handles, and we want to use a hashtable instead of an array to map fds to events. @@ -265,7 +265,7 @@ struct event_base { int current_event_waiters; #endif -#ifdef WIN32 +#ifdef _WIN32 /** IOCP support structure, if IOCP is enabled. */ struct event_iocp_port *iocp; #endif diff --git a/event.c b/event.c index 1496e2be..366d867d 100644 --- a/event.c +++ b/event.c @@ -27,14 +27,14 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #define WIN32_LEAN_AND_MEAN #include #undef WIN32_LEAN_AND_MEAN #endif #include -#if !defined(WIN32) && defined(_EVENT_HAVE_SYS_TIME_H) +#if !defined(_WIN32) && defined(_EVENT_HAVE_SYS_TIME_H) #include #endif #include @@ -88,7 +88,7 @@ extern const struct eventop kqops; #ifdef _EVENT_HAVE_DEVPOLL extern const struct eventop devpollops; #endif -#ifdef WIN32 +#ifdef _WIN32 extern const struct eventop win32ops; #endif @@ -112,7 +112,7 @@ static const struct eventop *eventops[] = { #ifdef _EVENT_HAVE_SELECT &selectops, #endif -#ifdef WIN32 +#ifdef _WIN32 &win32ops, #endif NULL @@ -634,7 +634,7 @@ event_base_new_with_config(const struct event_config *cfg) } #endif -#ifdef WIN32 +#ifdef _WIN32 if (cfg && (cfg->flags & EVENT_BASE_FLAG_STARTUP_IOCP)) event_base_start_iocp(base, cfg->n_cpus_hint); #endif @@ -645,7 +645,7 @@ event_base_new_with_config(const struct event_config *cfg) int event_base_start_iocp(struct event_base *base, int n_cpus) { -#ifdef WIN32 +#ifdef _WIN32 if (base->iocp) return 0; base->iocp = event_iocp_port_launch(n_cpus); @@ -662,7 +662,7 @@ event_base_start_iocp(struct event_base *base, int n_cpus) void event_base_stop_iocp(struct event_base *base) { -#ifdef WIN32 +#ifdef _WIN32 int rv; if (!base->iocp) @@ -689,7 +689,7 @@ event_base_free(struct event_base *base) /* XXX(niels) - check for internal events first */ EVUTIL_ASSERT(base); -#ifdef WIN32 +#ifdef _WIN32 event_base_stop_iocp(base); #endif @@ -1924,7 +1924,7 @@ evthread_notify_base_default(struct event_base *base) char buf[1]; int r; buf[0] = (char) 0; -#ifdef WIN32 +#ifdef _WIN32 r = send(base->th_notify_fd[1], buf, 1, 0); #else r = write(base->th_notify_fd[1], buf, 1); @@ -2614,7 +2614,7 @@ event_mm_strdup_(const char *str) memcpy(p, str, ln+1); return p; } else -#ifdef WIN32 +#ifdef _WIN32 return _strdup(str); #else return strdup(str); @@ -2673,7 +2673,7 @@ evthread_notify_drain_default(evutil_socket_t fd, short what, void *arg) { unsigned char buf[1024]; struct event_base *base = arg; -#ifdef WIN32 +#ifdef _WIN32 while (recv(fd, (char*)buf, sizeof(buf), 0) > 0) ; #else @@ -2723,7 +2723,7 @@ evthread_make_base_notifiable(struct event_base *base) } #endif -#ifdef WIN32 +#ifdef _WIN32 #define LOCAL_SOCKETPAIR_AF AF_INET #else #define LOCAL_SOCKETPAIR_AF AF_UNIX diff --git a/event.h b/event.h index e75e0756..fda6b391 100644 --- a/event.h +++ b/event.h @@ -177,7 +177,7 @@ extern "C" { /* For int types. */ #include -#ifdef WIN32 +#ifdef _WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/event_iocp.c b/event_iocp.c index 7fa39506..fbeda703 100644 --- a/event_iocp.c +++ b/event_iocp.c @@ -279,7 +279,7 @@ event_iocp_activate_overlapped( struct event_iocp_port * event_base_get_iocp(struct event_base *base) { -#ifdef WIN32 +#ifdef _WIN32 return base->iocp; #else return NULL; diff --git a/event_tagging.c b/event_tagging.c index f3ba1d2e..79ca3c98 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -35,7 +35,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include #include @@ -53,7 +53,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #ifdef _EVENT_HAVE_UNISTD_H diff --git a/evmap.c b/evmap.c index 3b7bc1c5..8af448ea 100644 --- a/evmap.c +++ b/evmap.c @@ -26,20 +26,20 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #define WIN32_LEAN_AND_MEAN #include #undef WIN32_LEAN_AND_MEAN #endif #include -#if !defined(WIN32) && defined(_EVENT_HAVE_SYS_TIME_H) +#if !defined(_WIN32) && defined(_EVENT_HAVE_SYS_TIME_H) #include #endif #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include diff --git a/evrpc.c b/evrpc.c index b1f6ceba..4ad1be0a 100644 --- a/evrpc.c +++ b/evrpc.c @@ -27,7 +27,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include #include @@ -35,7 +35,7 @@ #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #ifdef _EVENT_HAVE_SYS_TIME_H @@ -44,7 +44,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include diff --git a/evthread-internal.h b/evthread-internal.h index 847006ed..da6184c4 100644 --- a/evthread-internal.h +++ b/evthread-internal.h @@ -38,7 +38,7 @@ extern "C" { struct event_base; -#ifndef WIN32 +#ifndef _WIN32 /* On Windows, the way we currently make DLLs, it's not allowed for us to * have shared global structures. Thus, we only do the direct-call-to-function * code path if we know that the local shared library system supports it. diff --git a/evthread_win32.c b/evthread_win32.c index 73e545bf..7bb97bf9 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -26,7 +26,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #define WIN32_LEAN_AND_MEAN #include diff --git a/evutil.c b/evutil.c index 05b5d294..605bfa4b 100644 --- a/evutil.c +++ b/evutil.c @@ -27,7 +27,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #define WIN32_LEAN_AND_MEAN @@ -78,7 +78,7 @@ #include "strlcpy-internal.h" #include "ipv6-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #define open _open #define read _read #define close _close @@ -130,7 +130,7 @@ evutil_read_file(const char *filename, char **content_out, size_t *len_out, return -2; } read_so_far = 0; -#ifdef WIN32 +#ifdef _WIN32 #define N_TO_READ(x) ((x) > INT_MAX) ? INT_MAX : ((int)(x)) #else #define N_TO_READ(x) (x) @@ -156,7 +156,7 @@ evutil_read_file(const char *filename, char **content_out, size_t *len_out, int evutil_socketpair(int family, int type, int protocol, evutil_socket_t fd[2]) { -#ifndef WIN32 +#ifndef _WIN32 return socketpair(family, type, protocol, fd); #else return evutil_ersatz_socketpair(family, type, protocol, fd); @@ -174,7 +174,7 @@ evutil_ersatz_socketpair(int family, int type, int protocol, * for now, and really, when localhost is down sometimes, we * have other problems too. */ -#ifdef WIN32 +#ifdef _WIN32 #define ERR(e) WSA##e #else #define ERR(e) e @@ -268,7 +268,7 @@ evutil_ersatz_socketpair(int family, int type, int protocol, int evutil_make_socket_nonblocking(evutil_socket_t fd) { -#ifdef WIN32 +#ifdef _WIN32 { u_long nonblocking = 1; if (ioctlsocket(fd, FIONBIO, &nonblocking) == SOCKET_ERROR) { @@ -295,7 +295,7 @@ evutil_make_socket_nonblocking(evutil_socket_t fd) int evutil_make_listen_socket_reuseable(evutil_socket_t sock) { -#ifndef WIN32 +#ifndef _WIN32 int one = 1; /* REUSEADDR on Unix means, "don't hang on to this address after the * listener is closed." On Windows, though, it means "don't keep other @@ -310,7 +310,7 @@ evutil_make_listen_socket_reuseable(evutil_socket_t sock) int evutil_make_socket_closeonexec(evutil_socket_t fd) { -#if !defined(WIN32) && defined(_EVENT_HAVE_SETFD) +#if !defined(_WIN32) && defined(_EVENT_HAVE_SETFD) int flags; if ((flags = fcntl(fd, F_GETFD, NULL)) < 0) { event_warn("fcntl(%d, F_GETFD)", fd); @@ -327,7 +327,7 @@ evutil_make_socket_closeonexec(evutil_socket_t fd) int evutil_closesocket(evutil_socket_t sock) { -#ifndef WIN32 +#ifndef _WIN32 return close(sock); #else return closesocket(sock); @@ -341,7 +341,7 @@ evutil_strtoll(const char *s, char **endptr, int base) return (ev_int64_t)strtoll(s, endptr, base); #elif _EVENT_SIZEOF_LONG == 8 return (ev_int64_t)strtol(s, endptr, base); -#elif defined(WIN32) && defined(_MSC_VER) && _MSC_VER < 1300 +#elif defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1300 /* XXXX on old versions of MS APIs, we only support base * 10. */ ev_int64_t r; @@ -357,7 +357,7 @@ evutil_strtoll(const char *s, char **endptr, int base) if (endptr) *endptr = (char*) s; return r; -#elif defined(WIN32) +#elif defined(_WIN32) return (ev_int64_t) _strtoi64(s, endptr, base); #elif defined(_EVENT_SIZEOF_LONG_LONG) && _EVENT_SIZEOF_LONG_LONG == 8 long long r; @@ -434,7 +434,7 @@ evutil_gettimeofday(struct timeval *tv, struct timezone *tz) } #endif -#ifdef WIN32 +#ifdef _WIN32 int evutil_socket_geterror(evutil_socket_t sock) { @@ -714,7 +714,7 @@ evutil_parse_servname(const char *servname, const char *protocol, int n = parse_numeric_servname(servname); if (n>=0) return n; -#if defined(_EVENT_HAVE_GETSERVBYNAME) || defined(WIN32) +#if defined(_EVENT_HAVE_GETSERVBYNAME) || defined(_WIN32) if (!(hints->ai_flags & EVUTIL_AI_NUMERICSERV)) { struct servent *ent = getservbyname(servname, protocol); if (ent) { @@ -1214,7 +1214,7 @@ evutil_getaddrinfo(const char *nodename, const char *servname, * ever resolving even a literal IPv6 address when * ai_addrtype is PF_UNSPEC. */ -#ifdef WIN32 +#ifdef _WIN32 { int tmp_port; err = evutil_getaddrinfo_common(nodename,servname,&hints, @@ -1311,7 +1311,7 @@ evutil_getaddrinfo(const char *nodename, const char *servname, /* fall back to gethostbyname. */ /* XXXX This needs a lock everywhere but Windows. */ ent = gethostbyname(nodename); -#ifdef WIN32 +#ifdef _WIN32 err = WSAGetLastError(); #else err = h_errno; @@ -1447,7 +1447,7 @@ evutil_gai_strerror(int err) case EVUTIL_EAI_SYSTEM: return "system error"; default: -#if defined(USE_NATIVE_GETADDRINFO) && defined(WIN32) +#if defined(USE_NATIVE_GETADDRINFO) && defined(_WIN32) return gai_strerrorA(err); #elif defined(USE_NATIVE_GETADDRINFO) return gai_strerror(err); @@ -1457,7 +1457,7 @@ evutil_gai_strerror(int err) } } -#ifdef WIN32 +#ifdef _WIN32 #define E(code, s) { code, (s " [" #code " ]") } static struct { int code; const char *msg; } windows_socket_errors[] = { E(WSAEINTR, "Interrupted function call"), @@ -2091,7 +2091,7 @@ evutil_getenv(const char *varname) long _evutil_weakrand(void) { -#ifdef WIN32 +#ifdef _WIN32 return rand(); #else return random(); @@ -2150,7 +2150,7 @@ evutil_hex_char_to_int(char c) return -1; } -#ifdef WIN32 +#ifdef _WIN32 HANDLE evutil_load_windows_system_library(const TCHAR *library_name) { diff --git a/http.c b/http.c index fed40c39..ac928980 100644 --- a/http.c +++ b/http.c @@ -42,7 +42,7 @@ #include #endif -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -64,7 +64,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #endif @@ -72,7 +72,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include @@ -497,12 +497,12 @@ evhttp_maybe_add_date_header(struct evkeyvalq *headers) { if (evhttp_find_header(headers, "Date") == NULL) { char date[50]; -#ifndef WIN32 +#ifndef _WIN32 struct tm cur; #endif struct tm *cur_p; time_t t = time(NULL); -#ifdef WIN32 +#ifdef _WIN32 cur_p = gmtime(&t); #else gmtime_r(&t, &cur); @@ -1360,7 +1360,7 @@ evhttp_connection_cb(struct bufferevent *bufev, short what, void *arg) * when connecting to a local address. the cleanup is going * to reschedule this function call. */ -#ifndef WIN32 +#ifndef _WIN32 if (errno == ECONNREFUSED) goto cleanup; #endif diff --git a/include/event2/dns.h b/include/event2/dns.h index 3bb6f9eb..fea00e40 100644 --- a/include/event2/dns.h +++ b/include/event2/dns.h @@ -446,7 +446,7 @@ int evdns_base_load_hosts(struct evdns_base *base, const char *hosts_fname); @return 0 if successful, or -1 if an error occurred @see evdns_resolv_conf_parse() */ -#ifdef WIN32 +#ifdef _WIN32 int evdns_base_config_windows_nameservers(struct evdns_base *); #define EVDNS_BASE_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED #endif diff --git a/include/event2/dns_compat.h b/include/event2/dns_compat.h index 89b06fe6..1a63fb6f 100644 --- a/include/event2/dns_compat.h +++ b/include/event2/dns_compat.h @@ -323,7 +323,7 @@ void evdns_search_ndots_set(const int ndots); */ struct evdns_server_port *evdns_add_server_port(evutil_socket_t socket, int flags, evdns_request_callback_fn_type callback, void *user_data); -#ifdef WIN32 +#ifdef _WIN32 int evdns_config_windows_nameservers(void); #define EVDNS_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED #endif diff --git a/include/event2/rpc.h b/include/event2/rpc.h index 66a2612e..2fee4c2d 100644 --- a/include/event2/rpc.h +++ b/include/event2/rpc.h @@ -454,7 +454,7 @@ enum EVRPC_HOOK_TYPE { EVRPC_OUTPUT /**< apply the function to an output hook */ }; -#ifndef WIN32 +#ifndef _WIN32 /** Deprecated alias for EVRPC_INPUT. Not available on windows, where it * conflicts with platform headers. */ #define INPUT EVRPC_INPUT diff --git a/include/event2/thread.h b/include/event2/thread.h index f51bf3ef..f5b4fe3b 100644 --- a/include/event2/thread.h +++ b/include/event2/thread.h @@ -183,7 +183,7 @@ int evthread_set_condition_callbacks( void evthread_set_id_callback( unsigned long (*id_fn)(void)); -#if defined(WIN32) && !defined(_EVENT_DISABLE_THREAD_SUPPORT) +#if defined(_WIN32) && !defined(_EVENT_DISABLE_THREAD_SUPPORT) /** Sets up Libevent for use with Windows builtin locking and thread ID functions. Unavailable if Libevent is not built for Windows. diff --git a/include/event2/util.h b/include/event2/util.h index cada314a..687c92d9 100644 --- a/include/event2/util.h +++ b/include/event2/util.h @@ -63,7 +63,7 @@ extern "C" { #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -86,7 +86,7 @@ extern "C" { #ifdef _EVENT_HAVE_UINT64_T #define ev_uint64_t uint64_t #define ev_int64_t int64_t -#elif defined(WIN32) +#elif defined(_WIN32) #define ev_uint64_t unsigned __int64 #define ev_int64_t signed __int64 #elif _EVENT_SIZEOF_LONG_LONG == 8 @@ -102,7 +102,7 @@ extern "C" { #ifdef _EVENT_HAVE_UINT32_T #define ev_uint32_t uint32_t #define ev_int32_t int32_t -#elif defined(WIN32) +#elif defined(_WIN32) #define ev_uint32_t unsigned int #define ev_int32_t signed int #elif _EVENT_SIZEOF_LONG == 4 @@ -118,7 +118,7 @@ extern "C" { #ifdef _EVENT_HAVE_UINT16_T #define ev_uint16_t uint16_t #define ev_int16_t int16_t -#elif defined(WIN32) +#elif defined(_WIN32) #define ev_uint16_t unsigned short #define ev_int16_t signed short #elif _EVENT_SIZEOF_INT == 2 @@ -163,7 +163,7 @@ extern "C" { #define ev_ssize_t ssize_t #endif -#ifdef WIN32 +#ifdef _WIN32 #define ev_off_t ev_int64_t #else #define ev_off_t off_t @@ -201,7 +201,7 @@ extern "C" { #define EV_SSIZE_MIN ((-EV_SSIZE_MAX) - 1) -#ifdef WIN32 +#ifdef _WIN32 #define ev_socklen_t int #elif defined(_EVENT_socklen_t) #define ev_socklen_t _EVENT_socklen_t @@ -216,7 +216,7 @@ extern "C" { #endif #endif -#ifdef WIN32 +#ifdef _WIN32 /** A type wide enough to hold the output of "socket()" or "accept()". On * Windows, this is an intptr_t; elsewhere, it is an int. */ #define evutil_socket_t intptr_t @@ -273,7 +273,7 @@ int evutil_closesocket(evutil_socket_t sock); * function, and don't let you use strerror for the error codes. And handling * EWOULDBLOCK is ... different. */ -#ifdef WIN32 +#ifdef _WIN32 /** Return the most recent socket error. Not idempotent on all platforms. */ #define EVUTIL_SOCKET_ERROR() WSAGetLastError() /** Replace the most recent socket error with errcode */ diff --git a/iocp-internal.h b/iocp-internal.h index eb2eae49..abfd5af6 100644 --- a/iocp-internal.h +++ b/iocp-internal.h @@ -39,7 +39,7 @@ typedef void (*iocp_callback)(struct event_overlapped *, ev_uintptr_t, ev_ssize_ /* This whole file is actually win32 only. We wrap the structures in a win32 * ifdef so that we can test-compile code that uses these interfaces on * non-win32 platforms. */ -#ifdef WIN32 +#ifdef _WIN32 /** Internal use only. Wraps an OVERLAPPED that we're using for libevent diff --git a/listener.c b/listener.c index 0f3cecf8..aaceaae7 100644 --- a/listener.c +++ b/listener.c @@ -29,7 +29,7 @@ #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -53,7 +53,7 @@ #include "util-internal.h" #include "log-internal.h" #include "evthread-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #include "iocp-internal.h" #include "defer-internal.h" #include "event-internal.h" @@ -84,7 +84,7 @@ struct evconnlistener_event { struct event listener; }; -#ifdef WIN32 +#ifdef _WIN32 struct evconnlistener_iocp { struct evconnlistener base; evutil_socket_t fd; @@ -154,7 +154,7 @@ evconnlistener_new(struct event_base *base, { struct evconnlistener_event *lev; -#ifdef WIN32 +#ifdef _WIN32 if (base && event_base_get_iocp(base)) { const struct win32_extension_fns *ext = event_get_win32_extension_fns(); @@ -379,7 +379,7 @@ listener_read_cb(evutil_socket_t fd, short what, void *p) LOCK(lev); while (1) { struct sockaddr_storage ss; -#ifdef WIN32 +#ifdef _WIN32 int socklen = sizeof(ss); #else socklen_t socklen = sizeof(ss); @@ -427,7 +427,7 @@ listener_read_cb(evutil_socket_t fd, short what, void *p) } } -#ifdef WIN32 +#ifdef _WIN32 struct accepting_socket { CRITICAL_SECTION lock; struct event_overlapped overlapped; diff --git a/log.c b/log.c index 142719cc..8a3ca540 100644 --- a/log.c +++ b/log.c @@ -40,7 +40,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #include #define WIN32_LEAN_AND_MEAN #include diff --git a/sample/dns-example.c b/sample/dns-example.c index f2c1e020..33a49cc7 100644 --- a/sample/dns-example.c +++ b/sample/dns-example.c @@ -12,7 +12,7 @@ #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #else @@ -184,7 +184,7 @@ main(int c, char **v) { evdns_add_server_port_with_base(event_base, sock, 0, evdns_server_callback, NULL); } if (idx < c) { -#ifdef WIN32 +#ifdef _WIN32 evdns_base_config_windows_nameservers(evdns_base); #else evdns_base_resolv_conf_parse(evdns_base, DNS_OPTION_NAMESERVERS, diff --git a/sample/event-test.c b/sample/event-test.c index e4d7a423..0bddcf4e 100644 --- a/sample/event-test.c +++ b/sample/event-test.c @@ -12,7 +12,7 @@ #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -34,7 +34,7 @@ fifo_read(int fd, short event, void *arg) char buf[255]; int len; struct event *ev = arg; -#ifdef WIN32 +#ifdef _WIN32 DWORD dwBytesRead; #endif @@ -43,7 +43,7 @@ fifo_read(int fd, short event, void *arg) fprintf(stderr, "fifo_read called with fd: %d, event: %d, arg: %p\n", fd, event, arg); -#ifdef WIN32 +#ifdef _WIN32 len = ReadFile((HANDLE)fd, buf, sizeof(buf) - 1, &dwBytesRead, NULL); /* Check for end of file. */ @@ -74,7 +74,7 @@ int main(int argc, char **argv) { struct event evfifo; -#ifdef WIN32 +#ifdef _WIN32 HANDLE socket; /* Open a file. */ socket = CreateFileA("test.txt", /* open File */ @@ -125,7 +125,7 @@ main(int argc, char **argv) event_init(); /* Initalize one event */ -#ifdef WIN32 +#ifdef _WIN32 event_set(&evfifo, (int)socket, EV_READ, fifo_read, &evfifo); #else event_set(&evfifo, socket, EV_READ, fifo_read, &evfifo); @@ -135,7 +135,7 @@ main(int argc, char **argv) event_add(&evfifo, NULL); event_dispatch(); -#ifdef WIN32 +#ifdef _WIN32 CloseHandle(socket); #endif return (0); diff --git a/sample/hello-world.c b/sample/hello-world.c index d40af529..d3cf058a 100644 --- a/sample/hello-world.c +++ b/sample/hello-world.c @@ -11,7 +11,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include # ifdef _XOPEN_SOURCE_EXTENDED # include @@ -43,7 +43,7 @@ main(int argc, char **argv) struct event *signal_event; struct sockaddr_in sin; -#ifdef WIN32 +#ifdef _WIN32 WSADATA wsa_data; WSAStartup(0x0201, &wsa_data); #endif diff --git a/sample/http-server.c b/sample/http-server.c index 75caa414..2b2242bb 100644 --- a/sample/http-server.c +++ b/sample/http-server.c @@ -13,7 +13,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -47,7 +47,7 @@ /* Compatibility for possible missing IPv6 declarations */ #include "../util-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #define stat _stat #define fstat _fstat #define open _open @@ -203,7 +203,7 @@ send_document_cb(struct evhttp_request *req, void *arg) if (S_ISDIR(st.st_mode)) { /* If it's a directory, read the comments and make a little * index page */ -#ifdef WIN32 +#ifdef _WIN32 HANDLE d; WIN32_FIND_DATAA ent; char *pattern; @@ -217,7 +217,7 @@ send_document_cb(struct evhttp_request *req, void *arg) if (!strlen(path) || path[strlen(path)-1] != '/') trailing_slash = "/"; -#ifdef WIN32 +#ifdef _WIN32 dirlen = strlen(whole_path); pattern = malloc(dirlen+3); memcpy(pattern, whole_path, dirlen); @@ -244,7 +244,7 @@ send_document_cb(struct evhttp_request *req, void *arg) uri_root, path, /* XXX html-escape this? */ trailing_slash, decoded_path /* XXX html-escape this */); -#ifdef WIN32 +#ifdef _WIN32 do { const char *name = ent.cFileName; #else @@ -254,13 +254,13 @@ send_document_cb(struct evhttp_request *req, void *arg) evbuffer_add_printf(evb, "
  • %s\n", name, name);/* XXX escape this */ -#ifdef WIN32 +#ifdef _WIN32 } while (FindNextFileA(d, &ent)); #else } #endif evbuffer_add_printf(evb, "\n"); -#ifdef WIN32 +#ifdef _WIN32 CloseHandle(d); #else closedir(d); @@ -318,7 +318,7 @@ main(int argc, char **argv) struct evhttp_bound_socket *handle; unsigned short port = 0; -#ifdef WIN32 +#ifdef _WIN32 WSADATA WSAData; WSAStartup(0x101, &WSAData); #else diff --git a/sample/le-proxy.c b/sample/le-proxy.c index 446bfb56..4bab6a61 100644 --- a/sample/le-proxy.c +++ b/sample/le-proxy.c @@ -11,7 +11,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #else diff --git a/sample/signal-test.c b/sample/signal-test.c index 53c025f9..3772e2b7 100644 --- a/sample/signal-test.c +++ b/sample/signal-test.c @@ -9,7 +9,7 @@ #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -50,7 +50,7 @@ main(int argc, char **argv) { struct event signal_int; struct event_base* base; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/sample/time-test.c b/sample/time-test.c index 61b4a6c1..ddbc029a 100644 --- a/sample/time-test.c +++ b/sample/time-test.c @@ -13,7 +13,7 @@ #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #endif @@ -31,7 +31,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif @@ -71,7 +71,7 @@ main(int argc, char **argv) struct event_base *base; int flags; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/signal.c b/signal.c index a700c128..bd52ced3 100644 --- a/signal.c +++ b/signal.c @@ -29,7 +29,7 @@ #include "event2/event-config.h" #include "evconfig-private.h" -#ifdef WIN32 +#ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include #include @@ -82,7 +82,7 @@ on Linux do a reasonable thing using signalfd. */ -#ifndef WIN32 +#ifndef _WIN32 /* Windows wants us to call our signal handlers as __cdecl. Nobody else * expects you to do anything crazy like this. */ #define __cdecl @@ -181,7 +181,7 @@ evsig_init(struct event_base *base) */ if (evutil_socketpair( AF_UNIX, SOCK_STREAM, 0, base->sig.ev_signal_pair) == -1) { -#ifdef WIN32 +#ifdef _WIN32 /* Make this nonfatal on win32, where sometimes people have localhost firewalled. */ event_sock_warn(-1, "%s: socketpair", __func__); @@ -374,7 +374,7 @@ static void __cdecl evsig_handler(int sig) { int save_errno = errno; -#ifdef WIN32 +#ifdef _WIN32 int socket_errno = EVUTIL_SOCKET_ERROR(); #endif ev_uint8_t msg; @@ -394,7 +394,7 @@ evsig_handler(int sig) msg = sig; send(evsig_base_fd, (char*)&msg, 1, 0); errno = save_errno; -#ifdef WIN32 +#ifdef _WIN32 EVUTIL_SET_SOCKET_ERROR(socket_errno); #endif } diff --git a/test/bench.c b/test/bench.c index d0f831b9..47e8b4d2 100644 --- a/test/bench.c +++ b/test/bench.c @@ -40,7 +40,7 @@ #ifdef _EVENT_HAVE_SYS_TIME_H #include #endif -#ifdef WIN32 +#ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include #else @@ -125,14 +125,14 @@ run_once(void) int main(int argc, char **argv) { -#ifndef WIN32 +#ifndef _WIN32 struct rlimit rl; #endif int i, c; struct timeval *tv; int *cp; -#ifdef WIN32 +#ifdef _WIN32 WSADATA WSAData; WSAStartup(0x101, &WSAData); #endif @@ -156,7 +156,7 @@ main(int argc, char **argv) } } -#ifndef WIN32 +#ifndef _WIN32 rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50; if (setrlimit(RLIMIT_NOFILE, &rl) == -1) { perror("setrlimit"); diff --git a/test/bench_cascade.c b/test/bench_cascade.c index c25255ed..f23b58c2 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -32,7 +32,7 @@ #ifdef _EVENT_HAVE_SYS_TIME_H #include #endif -#ifdef WIN32 +#ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include #else @@ -134,7 +134,7 @@ run_once(int num_pipes) int main(int argc, char **argv) { -#ifndef WIN32 +#ifndef _WIN32 struct rlimit rl; #endif int i, c; @@ -152,7 +152,7 @@ main(int argc, char **argv) } } -#ifndef WIN32 +#ifndef _WIN32 rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50; if (setrlimit(RLIMIT_NOFILE, &rl) == -1) { perror("setrlimit"); diff --git a/test/bench_http.c b/test/bench_http.c index dd3dde89..1ec6ad50 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -27,7 +27,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -92,7 +92,7 @@ main(int argc, char **argv) int use_iocp = 0; unsigned short port = 8080; -#ifdef WIN32 +#ifdef _WIN32 WSADATA WSAData; WSAStartup(0x101, &WSAData); #else @@ -122,7 +122,7 @@ main(int argc, char **argv) exit(1); } break; -#ifdef WIN32 +#ifdef _WIN32 case 'i': use_iocp = 1; evthread_use_windows_threads(); diff --git a/test/bench_httpclient.c b/test/bench_httpclient.c index 25db4a7d..73797554 100644 --- a/test/bench_httpclient.c +++ b/test/bench_httpclient.c @@ -26,7 +26,7 @@ */ #include -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -201,7 +201,7 @@ main(int argc, char **argv) throughput = total_n_handled / (total.tv_sec+ ((double)total.tv_usec)/1000000.0); -#ifdef WIN32 +#ifdef _WIN32 #define I64_FMT "%I64d" #define I64_TYP __int64 #else diff --git a/test/regress.c b/test/regress.c index abe6af8c..5d408dc9 100644 --- a/test/regress.c +++ b/test/regress.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -38,7 +38,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -68,7 +68,7 @@ #include "regress.h" -#ifndef WIN32 +#ifndef _WIN32 #include "regress.gen.h" #endif @@ -93,7 +93,7 @@ static struct timeval tcalled; #define SHUT_WR 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #define write(fd,buf,len) send((fd),(buf),(int)(len),0) #define read(fd,buf,len) recv((fd),(buf),(int)(len),0) #endif @@ -408,7 +408,7 @@ test_simpleclose(void *ptr) short got_read_on_close = 0, got_write_on_close = 0; char buf[1024]; memset(buf, 99, sizeof(buf)); -#ifdef WIN32 +#ifdef _WIN32 #define LOCAL_SOCKETPAIR_AF AF_INET #else #define LOCAL_SOCKETPAIR_AF AF_UNIX @@ -776,7 +776,7 @@ end: data->base = NULL; } -#ifndef WIN32 +#ifndef _WIN32 static void signal_cb(evutil_socket_t fd, short event, void *arg); #define current_base event_global_current_base_ @@ -2061,7 +2061,7 @@ end: } } -#ifndef WIN32 +#ifndef _WIN32 /* You can't do this test on windows, since dup2 doesn't work on sockets */ static void @@ -2310,7 +2310,7 @@ struct testcase_t main_testcases[] = { { "event_once", test_event_once, TT_ISOLATED, &basic_setup, NULL }, { "event_pending", test_event_pending, TT_ISOLATED, &basic_setup, NULL }, -#ifndef WIN32 +#ifndef _WIN32 { "dup_fd", test_dup_fd, TT_ISOLATED, &basic_setup, NULL }, #endif { "mm_functions", test_mm_functions, TT_FORK, NULL, NULL }, @@ -2319,7 +2319,7 @@ struct testcase_t main_testcases[] = { { "struct_event_size", test_struct_event_size, 0, NULL, NULL }, -#ifndef WIN32 +#ifndef _WIN32 LEGACY(fork, TT_ISOLATED), #endif END_OF_TESTCASES @@ -2335,7 +2335,7 @@ struct testcase_t evtag_testcases[] = { }; struct testcase_t signal_testcases[] = { -#ifndef WIN32 +#ifndef _WIN32 LEGACY(simplesignal, TT_ISOLATED), LEGACY(multiplesignal, TT_ISOLATED), LEGACY(immediatesignal, TT_ISOLATED), diff --git a/test/regress_buffer.c b/test/regress_buffer.c index cf68f848..b5f21623 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -38,7 +38,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index d737b48d..79816396 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -28,7 +28,7 @@ /* The old tests here need assertions to work. */ #undef NDEBUG -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -41,7 +41,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -74,7 +74,7 @@ #include "event2/util.h" #include "bufferevent-internal.h" -#ifdef WIN32 +#ifdef _WIN32 #include "iocp-internal.h" #endif @@ -486,7 +486,7 @@ test_bufferevent_connect(void *arg) be_flags |= BEV_OPT_THREADSAFE; } bufferevent_connect_test_flags = be_flags; -#ifdef WIN32 +#ifdef _WIN32 if (!strcmp((char*)data->setup_data, "unset_connectex")) { struct win32_extension_fns *ext = (struct win32_extension_fns *) diff --git a/test/regress_dns.c b/test/regress_dns.c index 7868bbb3..01cb0dbf 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -39,7 +39,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include diff --git a/test/regress_et.c b/test/regress_et.c index 9da53fdb..ee6e6419 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -26,7 +26,7 @@ #include "event2/event-config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include @@ -38,7 +38,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #endif @@ -75,7 +75,7 @@ read_cb(evutil_socket_t fd, short event, void *arg) #define SHUT_WR 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #define LOCAL_SOCKETPAIR_AF AF_INET #else #define LOCAL_SOCKETPAIR_AF AF_UNIX diff --git a/test/regress_http.c b/test/regress_http.c index cf0fb971..b232469c 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -39,7 +39,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -154,7 +154,7 @@ http_connect(const char *address, u_short port) evutil_make_socket_nonblocking(fd); if (connect(fd, sa, slen) == -1) { -#ifdef WIN32 +#ifdef _WIN32 int tmp_err = WSAGetLastError(); if (tmp_err != WSAEINPROGRESS && tmp_err != WSAEINVAL && tmp_err != WSAEWOULDBLOCK) @@ -487,7 +487,7 @@ http_badreq_errorcb(struct bufferevent *bev, short what, void *arg) } #ifndef SHUT_WR -#ifdef WIN32 +#ifdef _WIN32 #define SHUT_WR SD_SEND #else #define SHUT_WR 1 diff --git a/test/regress_listener.c b/test/regress_listener.c index 44fee7f4..5a794cc4 100644 --- a/test/regress_listener.c +++ b/test/regress_listener.c @@ -24,14 +24,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include # ifdef _XOPEN_SOURCE_EXTENDED @@ -119,7 +119,7 @@ regress_pick_a_port(void *arg) evutil_socket_connect(&fd2, (struct sockaddr*)&ss1, slen1); evutil_socket_connect(&fd3, (struct sockaddr*)&ss2, slen2); -#ifdef WIN32 +#ifdef _WIN32 Sleep(100); /* XXXX this is a stupid stopgap. */ #endif event_base_dispatch(base); diff --git a/test/regress_main.c b/test/regress_main.c index 849d7e0d..26635f9e 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -51,7 +51,7 @@ #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -111,7 +111,7 @@ static void dnslogcb(int w, const char *m) int regress_make_tmpfile(const void *data, size_t datalen, char **filename_out) { -#ifndef WIN32 +#ifndef _WIN32 char tmpfilename[32]; int fd; *filename_out = NULL; @@ -168,7 +168,7 @@ basic_test_setup(const struct testcase_t *testcase) evutil_socket_t spair[2] = { -1, -1 }; struct basic_test_data *data = NULL; -#ifndef WIN32 +#ifndef _WIN32 if (testcase->flags & TT_ENABLE_IOCP_FLAG) return (void*)TT_SKIP; #endif @@ -328,7 +328,7 @@ const struct testcase_setup_t legacy_setup = { /* ============================================================ */ -#if (!defined(_EVENT_HAVE_PTHREADS) && !defined(WIN32)) || defined(_EVENT_DISABLE_THREAD_SUPPORT) +#if (!defined(_EVENT_HAVE_PTHREADS) && !defined(_WIN32)) || defined(_EVENT_DISABLE_THREAD_SUPPORT) struct testcase_t thread_testcases[] = { { "basic", NULL, TT_SKIP, NULL, NULL }, END_OF_TESTCASES @@ -349,7 +349,7 @@ struct testgroup_t testgroups[] = { { "rpc/", rpc_testcases }, { "thread/", thread_testcases }, { "listener/", listener_testcases }, -#ifdef WIN32 +#ifdef _WIN32 { "iocp/", iocp_testcases }, { "iocp/bufferevent/", bufferevent_iocp_testcases }, { "iocp/listener/", listener_iocp_testcases }, @@ -363,7 +363,7 @@ struct testgroup_t testgroups[] = { int main(int argc, const char **argv) { -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; @@ -373,12 +373,12 @@ main(int argc, const char **argv) err = WSAStartup(wVersionRequested, &wsaData); #endif -#ifndef WIN32 +#ifndef _WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) return 1; #endif -#ifdef WIN32 +#ifdef _WIN32 tinytest_skip(testgroups, "http/connection_retry"); #endif diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 9362e493..d9d59ec0 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -28,7 +28,7 @@ /* The old tests here need assertions to work. */ #undef NDEBUG -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -41,7 +41,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include diff --git a/test/regress_ssl.c b/test/regress_ssl.c index e16bf8b3..c2f7a14d 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -24,12 +24,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif -#ifndef WIN32 +#ifndef _WIN32 #include #include #endif diff --git a/test/regress_testutils.c b/test/regress_testutils.c index 8902e631..b9446ae7 100644 --- a/test/regress_testutils.c +++ b/test/regress_testutils.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -38,7 +38,7 @@ #include #endif #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include diff --git a/test/regress_thread.c b/test/regress_thread.c index cbc1efef..d08edf36 100644 --- a/test/regress_thread.c +++ b/test/regress_thread.c @@ -42,7 +42,7 @@ #ifdef _EVENT_HAVE_PTHREADS #include -#elif defined(WIN32) +#elif defined(_WIN32) #include #endif #include @@ -156,7 +156,7 @@ basic_thread(void *arg) } static int notification_fd_used = 0; -#ifndef WIN32 +#ifndef _WIN32 static int got_sigchld = 0; static void sigchld_cb(evutil_socket_t fd, short event, void *arg) @@ -199,7 +199,7 @@ thread_basic(void *arg) tt_abort_msg("Couldn't make base notifiable!"); } -#ifndef WIN32 +#ifndef _WIN32 if (data->setup_data && !strcmp(data->setup_data, "forking")) { pid_t pid; int status; @@ -403,7 +403,7 @@ end: #define CB_COUNT 128 #define QUEUE_THREAD_COUNT 8 -#ifdef WIN32 +#ifdef _WIN32 #define SLEEP_MS(ms) Sleep(ms) #else #define SLEEP_MS(ms) usleep((ms) * 1000) @@ -500,7 +500,7 @@ end: struct testcase_t thread_testcases[] = { { "basic", thread_basic, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE, &basic_setup, NULL }, -#ifndef WIN32 +#ifndef _WIN32 { "forking", thread_basic, TT_FORK|TT_NEED_THREADS|TT_NEED_BASE, &basic_setup, (char*)"forking" }, #endif diff --git a/test/regress_util.c b/test/regress_util.c index f31bb4a2..00b87c13 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef WIN32 +#ifdef _WIN32 #include #include #include @@ -33,7 +33,7 @@ #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -441,7 +441,7 @@ fatalfn(int exitcode) exit(exitcode); } -#ifndef WIN32 +#ifndef _WIN32 #define CAN_CHECK_ERR static void check_error_logging(void (*fn)(void), int wantexitcode, @@ -481,7 +481,7 @@ static void sock_err_fn(void) { evutil_socket_t fd = socket(AF_INET, SOCK_STREAM, 0); -#ifdef WIN32 +#ifdef _WIN32 EVUTIL_SET_SOCKET_ERROR(WSAEWOULDBLOCK); #else errno = EAGAIN; @@ -553,7 +553,7 @@ test_evutil_log(void *ptr) /* Try with a socket errno. */ fd = socket(AF_INET, SOCK_STREAM, 0); -#ifdef WIN32 +#ifdef _WIN32 evutil_snprintf(buf, sizeof(buf), "Unhappy socket: %s", evutil_socket_error_to_string(WSAEWOULDBLOCK)); @@ -1037,7 +1037,7 @@ end: evutil_freeaddrinfo(ai); } -#ifdef WIN32 +#ifdef _WIN32 static void test_evutil_loadsyslib(void *arg) { @@ -1068,7 +1068,7 @@ struct testcase_t util_testcases[] = { { "integers", test_evutil_integers, 0, NULL, NULL }, { "rand", test_evutil_rand, TT_FORK, NULL, NULL }, { "getaddrinfo", test_evutil_getaddrinfo, TT_FORK, NULL, NULL }, -#ifdef WIN32 +#ifdef _WIN32 { "loadsyslib", test_evutil_loadsyslib, TT_FORK, NULL, NULL }, #endif END_OF_TESTCASES, diff --git a/test/regress_zlib.c b/test/regress_zlib.c index 6dd7bf8f..e74c1fff 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -27,7 +27,7 @@ /* The old tests here need assertions to work. */ #undef NDEBUG -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -35,7 +35,7 @@ #include "event2/event-config.h" #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include diff --git a/test/test-changelist.c b/test/test-changelist.c index f368f1cb..1b2af0e8 100644 --- a/test/test-changelist.c +++ b/test/test-changelist.c @@ -4,7 +4,7 @@ #include "event2/event-config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include #else @@ -30,7 +30,7 @@ #include struct cpu_usage_timer { -#ifdef WIN32 +#ifdef _WIN32 HANDLE thread; FILETIME usertimeBegin; FILETIME kerneltimeBegin; @@ -42,7 +42,7 @@ struct cpu_usage_timer { static void start_cpu_usage_timer(struct cpu_usage_timer *timer) { -#ifdef WIN32 +#ifdef _WIN32 int r; FILETIME createtime, exittime; timer->thread = GetCurrentThread(); @@ -55,7 +55,7 @@ start_cpu_usage_timer(struct cpu_usage_timer *timer) evutil_gettimeofday(&timer->timeBegin, NULL); } -#ifdef WIN32 +#ifdef _WIN32 static ev_int64_t filetime_to_100nsec(const FILETIME *ft) { @@ -82,7 +82,7 @@ static void get_cpu_usage(struct cpu_usage_timer *timer, double *secElapsedOut, double *secUsedOut, double *usageOut) { -#ifdef WIN32 +#ifdef _WIN32 double usertime_seconds, kerneltime_seconds; FILETIME createtime, exittime, usertimeEnd, kerneltimeEnd; int r; @@ -92,7 +92,7 @@ get_cpu_usage(struct cpu_usage_timer *timer, double *secElapsedOut, struct timeval timeEnd, timeDiff; double secondsPassed, secondsUsed; -#ifdef WIN32 +#ifdef _WIN32 r = GetThreadTimes(timer->thread, &createtime, &exittime, &usertimeEnd, &kerneltimeEnd); if (r==0) printf("GetThreadTimes failed."); @@ -149,7 +149,7 @@ main(int argc, char **argv) double usage, secPassed, secUsed; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/test/test-eof.c b/test/test-eof.c index 417476e8..b3cd7dfd 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -4,7 +4,7 @@ */ #include "event2/event-config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -70,7 +70,7 @@ main(int argc, char **argv) const char *test = "test string"; evutil_socket_t pair[2]; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/test/test-init.c b/test/test-init.c index 967a0131..7e1bf8c7 100644 --- a/test/test-init.c +++ b/test/test-init.c @@ -16,7 +16,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include @@ -26,7 +26,7 @@ int main(int argc, char **argv) { -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/test/test-ratelim.c b/test/test-ratelim.c index bbbd7608..5c4b2a21 100644 --- a/test/test-ratelim.c +++ b/test/test-ratelim.c @@ -30,7 +30,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #else @@ -85,7 +85,7 @@ loud_writecb(struct bufferevent *bev, void *ctx) struct client_state *cs = ctx; struct evbuffer *output = bufferevent_get_output(bev); char buf[1024]; -#ifdef WIN32 +#ifdef _WIN32 int r = rand() % 256; #else int r = random() % 256; @@ -404,7 +404,7 @@ main(int argc, char **argv) int i,j; double ratio; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested = MAKEWORD(2,2); WSADATA wsaData; int err; @@ -412,7 +412,7 @@ main(int argc, char **argv) err = WSAStartup(wVersionRequested, &wsaData); #endif -#ifndef WIN32 +#ifndef _WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) return 1; #endif @@ -446,7 +446,7 @@ main(int argc, char **argv) { struct timeval tv; evutil_gettimeofday(&tv, NULL); -#ifdef WIN32 +#ifdef _WIN32 srand(tv.tv_usec); #else srandom(tv.tv_usec); diff --git a/test/test-time.c b/test/test-time.c index 5628696e..8e431487 100644 --- a/test/test-time.c +++ b/test/test-time.c @@ -10,7 +10,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #endif @@ -29,7 +29,7 @@ struct event *ev[NEVENT]; static int rand_int(int n) { -#ifdef WIN32 +#ifdef _WIN32 return (int)(rand() % n); #else return (int)(random() % n); @@ -62,7 +62,7 @@ main(int argc, char **argv) { struct timeval tv; int i; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; diff --git a/test/test-weof.c b/test/test-weof.c index b20f27e1..87a04a28 100644 --- a/test/test-weof.c +++ b/test/test-weof.c @@ -4,7 +4,7 @@ */ #include "event2/event-config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -63,7 +63,7 @@ main(int argc, char **argv) { struct event ev; -#ifdef WIN32 +#ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; int err; @@ -73,7 +73,7 @@ main(int argc, char **argv) err = WSAStartup(wVersionRequested, &wsaData); #endif -#ifndef WIN32 +#ifndef _WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) return (1); #endif diff --git a/test/tinytest.c b/test/tinytest.c index d0b77f74..8caa4f54 100644 --- a/test/tinytest.c +++ b/test/tinytest.c @@ -32,7 +32,7 @@ #include "tinytest_local.h" #endif -#ifdef WIN32 +#ifdef _WIN32 #include #else #include @@ -65,7 +65,7 @@ const char *cur_test_prefix = NULL; /**< prefix of the current test group */ /** Name of the current test, if we haven't logged is yet. Used for --quiet */ const char *cur_test_name = NULL; -#ifdef WIN32 +#ifdef _WIN32 /** Pointer to argv[0] for win32. */ static const char *commandname = NULL; #endif @@ -104,7 +104,7 @@ static enum outcome _testcase_run_forked(const struct testgroup_t *group, const struct testcase_t *testcase) { -#ifdef WIN32 +#ifdef _WIN32 /* Fork? On Win32? How primitive! We'll do what the smart kids do: we'll invoke our own exe (whose name we recall from the command line) with a command line that tells it to run just the test we @@ -290,7 +290,7 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) { int i, j, n=0; -#ifdef WIN32 +#ifdef _WIN32 commandname = v[0]; #endif for (i=1; i #endif diff --git a/util-internal.h b/util-internal.h index a941dbac..770d158c 100644 --- a/util-internal.h +++ b/util-internal.h @@ -73,7 +73,7 @@ extern "C" { data," and we need to look at the error code. Second, Windows defines a different set of error codes for sockets. */ -#ifndef WIN32 +#ifndef _WIN32 /* True iff e is an error that means a read/write operation can be retried. */ #define EVUTIL_ERR_RW_RETRIABLE(e) \ @@ -268,7 +268,7 @@ long evutil_tv_to_msec(const struct timeval *tv); int evutil_hex_char_to_int(char c); -#ifdef WIN32 +#ifdef _WIN32 HANDLE evutil_load_windows_system_library(const TCHAR *library_name); #endif