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 4964c145eec882e2656389a94e5cab5b5d706f30..c41a1776d72819caa781f52ab36d33adc0419407 100644 (file)
--- 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 a0cf8ef5610df2d5cfaa8b4f9c819092e4da05e3..a14c8b3423fba030f969ec97fb199c3be710b213 100644 (file)
--- 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 e88654c92be83c951c71c228197e076db00346cf..f697a53cd63e179e3f61607736f90a83e6132ad9 100644 (file)
--- 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