From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 May 2008 21:51:49 +0000 (+0000)
Subject:  r19641@catbus:  nickm | 2008-05-07 17:51:26 -0400
X-Git-Tag: release-2.0.1-alpha~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a804f3c837f7969d04f6604a40897a9b5aa8c57;p=libevent

 r19641@catbus:  nickm | 2008-05-07 17:51:26 -0400
 Forward-port: Fix win32 vc-2005 build.


svn:r786
---

diff --git a/WIN32-Code/config.h b/WIN32-Code/config.h
index 4964c145..c41a1776 100644
--- a/WIN32-Code/config.h
+++ b/WIN32-Code/config.h
@@ -47,7 +47,7 @@
 /* #undef HAVE_INET_NTOP */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+/* #undef HAVE_INTTYPES_H 1 */
 
 /* Define to 1 if you have the `kqueue' function. */
 /* #undef HAVE_KQUEUE */
diff --git a/WIN32-Code/event-config.h b/WIN32-Code/event-config.h
index a0cf8ef5..a14c8b34 100644
--- a/WIN32-Code/event-config.h
+++ b/WIN32-Code/event-config.h
@@ -51,7 +51,7 @@
 /* #undef _EVENT_HAVE_INET_NTOP */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define _EVENT_HAVE_INTTYPES_H 1
+/* #define _EVENT_HAVE_INTTYPES_H 1 */
 
 /* Define to 1 if you have the `kqueue' function. */
 /* #undef _EVENT_HAVE_KQUEUE */
diff --git a/include/event2/util.h b/include/event2/util.h
index e88654c9..f697a53c 100644
--- a/include/event2/util.h
+++ b/include/event2/util.h
@@ -58,8 +58,8 @@ extern "C" {
 #define ev_uint64_t uint64_t
 #define ev_int64_t int64_t
 #elif defined(WIN32)
-#define ev_uint64_t __uint64_t
-#define ev_int64_t __int64_t
+#define ev_uint64_t unsigned __int64
+#define ev_int64_t signed __int64
 #elif _EVENT_SIZEOF_LONG_LONG == 8
 #define ev_uint64_t unsigned long long
 #define ev_int64_t long long