From: <ni...@us...> - 2009-07-28 19:41:50
|
Revision: 1385 http://levent.svn.sourceforge.net/levent/?rev=1385&view=rev Author: nickm Date: 2009-07-28 19:41:39 +0000 (Tue, 28 Jul 2009) Log Message: ----------- Various MSVC cleanups from Brodie Thiesfield. Modified Paths: -------------- trunk/libevent/WIN32-Code/event-config.h trunk/libevent/WIN32-Code/win32.c trunk/libevent/buffer_iocp.c trunk/libevent/evdns.c trunk/libevent/event.h trunk/libevent/event_iocp.c trunk/libevent/evmap.c trunk/libevent/include/event2/event_struct.h trunk/libevent/log.c trunk/libevent/sample/event-test.c trunk/libevent/sample/signal-test.c trunk/libevent/test/regress_dns.c trunk/libevent/test/regress_et.c trunk/libevent/test/regress_http.c trunk/libevent/test/regress_main.c trunk/libevent/test/tinytest.c Modified: trunk/libevent/WIN32-Code/event-config.h =================================================================== --- trunk/libevent/WIN32-Code/event-config.h 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/WIN32-Code/event-config.h 2009-07-28 19:41:39 UTC (rev 1385) @@ -334,4 +334,6 @@ /* Define to `int' if <sys/types.h> does not define. */ #define _EVENT_ssize_t intptr_t +#define ssize_t SSIZE_T + #endif Modified: trunk/libevent/WIN32-Code/win32.c =================================================================== --- trunk/libevent/WIN32-Code/win32.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/WIN32-Code/win32.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -334,11 +334,12 @@ } } if (win32op->writeset_out->fd_count) { + SOCKET s; i = rand() % win32op->writeset_out->fd_count; for (j=0; j<win32op->writeset_out->fd_count; ++j) { if (++i >= win32op->writeset_out->fd_count) i = 0; - SOCKET s = win32op->writeset_out->fd_array[i]; + s = win32op->writeset_out->fd_array[i]; evmap_io_active(base, s, EV_WRITE); } } Modified: trunk/libevent/buffer_iocp.c =================================================================== --- trunk/libevent/buffer_iocp.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/buffer_iocp.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -42,6 +42,7 @@ #include "iocp-internal.h" #include "mm-internal.h" +#include <winsock2.h> #include <windows.h> #include <assert.h> #include <stdio.h> Modified: trunk/libevent/evdns.c =================================================================== --- trunk/libevent/evdns.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/evdns.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -121,6 +121,7 @@ #include "evthread-internal.h" #ifdef WIN32 #include <ctype.h> +#include <winsock2.h> #include <windows.h> #include <iphlpapi.h> #include <io.h> Modified: trunk/libevent/event.h =================================================================== --- trunk/libevent/event.h 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/event.h 2009-07-28 19:41:39 UTC (rev 1385) @@ -179,6 +179,7 @@ #ifdef WIN32 #define WIN32_LEAN_AND_MEAN +#include <winsock2.h> #include <windows.h> #undef WIN32_LEAN_AND_MEAN typedef unsigned char u_char; Modified: trunk/libevent/event_iocp.c =================================================================== --- trunk/libevent/event_iocp.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/event_iocp.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -24,6 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <winsock2.h> #include <windows.h> #include <process.h> #include <stdio.h> Modified: trunk/libevent/evmap.c =================================================================== --- trunk/libevent/evmap.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/evmap.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -28,6 +28,7 @@ #endif #ifdef WIN32 +#include <winsock2.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN @@ -35,7 +36,7 @@ #include <sys/types.h> #ifdef _EVENT_HAVE_SYS_TIME_H #include <sys/time.h> -#else +#elif !defined(WIN32) #include <sys/_time.h> #endif #include <sys/queue.h> Modified: trunk/libevent/include/event2/event_struct.h =================================================================== --- trunk/libevent/include/event2/event_struct.h 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/include/event2/event_struct.h 2009-07-28 19:41:39 UTC (rev 1385) @@ -50,6 +50,7 @@ #include <event2/util.h> #ifdef WIN32 +#include <winsock2.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN Modified: trunk/libevent/log.c =================================================================== --- trunk/libevent/log.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/log.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -42,6 +42,7 @@ #endif #ifdef WIN32 +#include <winsock2.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN @@ -49,7 +50,7 @@ #include <sys/types.h> #ifdef _EVENT_HAVE_SYS_TIME_H #include <sys/time.h> -#else +#elif !defined(WIN32) #include <sys/_time.h> #endif #include <stdio.h> Modified: trunk/libevent/sample/event-test.c =================================================================== --- trunk/libevent/sample/event-test.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/sample/event-test.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -14,6 +14,7 @@ #include <unistd.h> #include <sys/time.h> #else +#include <winsock2.h> #include <windows.h> #endif #include <fcntl.h> Modified: trunk/libevent/sample/signal-test.c =================================================================== --- trunk/libevent/sample/signal-test.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/sample/signal-test.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -16,6 +16,7 @@ #include <unistd.h> #include <sys/time.h> #else +#include <winsock2.h> #include <windows.h> #endif #include <signal.h> Modified: trunk/libevent/test/regress_dns.c =================================================================== --- trunk/libevent/test/regress_dns.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/test/regress_dns.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -61,6 +61,7 @@ #include "event2/event.h" #include "event2/event_compat.h" +#include <event2/util.h> #include "evdns.h" #include "log-internal.h" #include "regress.h" @@ -222,7 +223,7 @@ ans.s_addr = htonl(0xc0a80b0bUL); /* 192.168.11.11 */ if (req->questions[i]->type == EVDNS_TYPE_A && req->questions[i]->dns_question_class == EVDNS_CLASS_INET && - !strcasecmp(req->questions[i]->name, "zz.example.com")) { + !evutil_strcasecmp(req->questions[i]->name, "zz.example.com")) { r = evdns_server_request_add_a_reply(req, req->questions[i]->name, 1, &ans.s_addr, 12345); @@ -230,7 +231,7 @@ dns_ok = 0; } else if (req->questions[i]->type == EVDNS_TYPE_AAAA && req->questions[i]->dns_question_class == EVDNS_CLASS_INET && - !strcasecmp(req->questions[i]->name, "zz.example.com")) { + !evutil_strcasecmp(req->questions[i]->name, "zz.example.com")) { char addr6[17] = "abcdefghijklmnop"; r = evdns_server_request_add_aaaa_reply(req, req->questions[i]->name, @@ -239,7 +240,7 @@ dns_ok = 0; } else if (req->questions[i]->type == EVDNS_TYPE_PTR && req->questions[i]->dns_question_class == EVDNS_CLASS_INET && - !strcasecmp(req->questions[i]->name, TEST_ARPA)) { + !evutil_strcasecmp(req->questions[i]->name, TEST_ARPA)) { r = evdns_server_request_add_ptr_reply(req, NULL, req->questions[i]->name, "ZZ.EXAMPLE.COM", 54321); @@ -247,7 +248,7 @@ dns_ok = 0; } else if (req->questions[i]->type == EVDNS_TYPE_A && req->questions[i]->dns_question_class == EVDNS_CLASS_INET && - !strcasecmp(req->questions[i]->name, "drop.example.com")) { + !evutil_strcasecmp(req->questions[i]->name, "drop.example.com")) { if (evdns_server_request_drop(req)<0) dns_ok = 0; return; Modified: trunk/libevent/test/regress_et.c =================================================================== --- trunk/libevent/test/regress_et.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/test/regress_et.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -31,7 +31,6 @@ #endif #include <sys/types.h> #include <sys/stat.h> -#include <sys/time.h> #ifdef _EVENT_HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -39,7 +38,10 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#ifndef WIN32 +#include <sys/time.h> #include <unistd.h> +#endif #include <errno.h> #include <event2/event.h> Modified: trunk/libevent/test/regress_http.c =================================================================== --- trunk/libevent/test/regress_http.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/test/regress_http.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -2102,7 +2102,7 @@ http_multi_line_header_test(void) { struct bufferevent *bev= NULL; - int fd = -1; + evutil_socket_t fd = -1; const char *http_start_request; short port = -1; @@ -2135,7 +2135,7 @@ if (bev) bufferevent_free(bev); if (fd >= 0) - close(fd); + EVUTIL_CLOSESOCKET(fd); if (http) evhttp_free(http); } Modified: trunk/libevent/test/regress_main.c =================================================================== --- trunk/libevent/test/regress_main.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/test/regress_main.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -28,6 +28,7 @@ #ifdef WIN32 #include <winsock2.h> #include <windows.h> +#define __func__ __FUNCTION__ #endif #ifdef HAVE_CONFIG_H Modified: trunk/libevent/test/tinytest.c =================================================================== --- trunk/libevent/test/tinytest.c 2009-07-28 17:11:03 UTC (rev 1384) +++ trunk/libevent/test/tinytest.c 2009-07-28 19:41:39 UTC (rev 1385) @@ -29,6 +29,7 @@ #include <assert.h> #ifdef WIN32 +#include <winsock2.h> #include <windows.h> #else #include <sys/types.h> @@ -36,6 +37,8 @@ #include <unistd.h> #endif +#include <event2/util.h> + #include "tinytest.h" #include "tinytest_macros.h" @@ -116,7 +119,7 @@ if (opt_verbosity>0) printf("[forking] "); - snprintf(buffer, sizeof(buffer), "%s --RUNNING-FORKED %s %s%s", + evutil_snprintf(buffer, sizeof(buffer), "%s --RUNNING-FORKED %s %s%s", commandname, verbosity_flag, group->prefix, testcase->name); memset(&si, 0, sizeof(si)); @@ -245,7 +248,7 @@ length = strstr(arg,"..")-arg; for (i=0; groups[i].prefix; ++i) { for (j=0; groups[i].cases[j].name; ++j) { - snprintf(fullname, sizeof(fullname), "%s%s", + evutil_snprintf(fullname, sizeof(fullname), "%s%s", groups[i].prefix, groups[i].cases[j].name); if (!flag) /* Hack! */ printf(" %s\n", fullname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |