mcatan 2004/04/28 14:34:20
Modified: include/log4cxx/helpers tchar.h
. configure.in
Log:
undefine _T for MacOS X
Revision Changes Path
1.31 +4 -0 logging-log4cxx/include/log4cxx/helpers/tchar.h
Index: tchar.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/tchar.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tchar.h 24 Apr 2004 21:34:42 -0000 1.30
+++ tchar.h 28 Apr 2004 21:34:20 -0000 1.31
@@ -74,6 +74,10 @@
}
}
+#ifdef MUST_UNDEF_T
+#undef _T
+#endif
+
#ifdef WIN32
#ifndef USES_CONVERSION
#include <malloc.h>
1.34 +9 -0 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.in 24 Apr 2004 08:11:32 -0000 1.33
+++ configure.in 28 Apr 2004 21:34:20 -0000 1.34
@@ -323,6 +323,15 @@
;;
esac
+#for _T
+
+case "$host" in
+ *apple-darwin*)
+ AC_DEFINE(MUST_UNDEF_T, 1, Defined to 1 if macro _T has to be undefined)
+ ;;
+esac
+
+
# Create files
#
----------------------------------------------------------------------------
