From 580a3ff657ee0b3b304bfd563daa6a91f75e0e34 Mon Sep 17 00:00:00 2001 From: Philippe Hamelin Date: Wed, 15 Jun 2011 09:54:14 -0400 Subject: [PATCH] win32: fix conflicting definition and typedef of int64_t when both log4cpp and boost::date_time are included. The fix has been inspired from this entry in the bug tracker: http://sourceforge.net/tracker/index.php?func=detail&aid=2736791&group_id=15190&atid=115190 --- include/log4cpp/config-win32.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/log4cpp/config-win32.h b/include/log4cpp/config-win32.h index 91ac3f2..9fa9195 100644 --- a/include/log4cpp/config-win32.h +++ b/include/log4cpp/config-win32.h @@ -17,7 +17,7 @@ /* define if the compiler has int64_t */ #ifndef LOG4CPP_HAVE_INT64_T #define LOG4CPP_HAVE_INT64_T -#define int64_t __int64 +typedef __int64 int64_t; /* define if the compiler has in_addr_t */ #ifndef LOG4CPP_HAVE_IN_ADDR_T -- 1.7.4.msysgit.0