Release 3-2-4 with tag: REL_mrw-c++-3-2-4

17 years ago · 92d9a56eea
parent badbe2d1fc
commit 92d9a56eea
8 changed files with 16 additions and 7 deletions
--- a/3
+++ b/3
@ -1,3 +1,6 @@
+* Mon Aug 20 2007 Marc Waeckerlin - mrw-c++-3.2.5 (mrw)
+	- New checkinstall.sh, cause checkinstall does not work otherwise
+	- "#if _REENTRANT" needs "defined(...)"
 * Tue Aug 16 2007 Marc Waeckerlin - mrw-c++-3.2.4 (mrw)
 	- Changed specfiles to eilminate build problems
 * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.3 (mrw)
--- a/makefile.am
+++ b/makefile.am
@ -11,7 +11,7 @@

 SUBDIRS = mrw

-EXTRA_DIST = bootstrap.sh
+EXTRA_DIST = bootstrap.sh checkinstall.sh

 nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp \
                         mrw/unistd.hpp \
--- a/mrw/autofunctiontracelog4cxx.cpp
+++ b/mrw/autofunctiontracelog4cxx.cpp
@ -23,7 +23,8 @@
 #include <mrw/stacktrace.hpp>
 #include <log4cxx/logger.h>

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif

--- a/mrw/autofunctiontracestdlog.cpp
+++ b/mrw/autofunctiontracestdlog.cpp
@ -21,7 +21,8 @@
 #include <iostream>
 #include <iomanip>

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif

--- a/mrw/log4cxxconfiguration.cpp
+++ b/mrw/log4cxxconfiguration.cpp
@ -27,7 +27,8 @@
 #include <log4cxx/helpers/properties.h>
 #include <fstream>

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif

--- a/mrw/mrwautofunctiontracelog4cxx_test.cpp
+++ b/mrw/mrwautofunctiontracelog4cxx_test.cpp
@ -35,7 +35,8 @@
 #include <mrw/stacktrace.hpp>
 #include <map>

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif

--- a/mrw/stacktrace.cpp
+++ b/mrw/stacktrace.cpp
@ -53,7 +53,8 @@
  }
 #endif

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif

--- a/mrw/stacktrace.hpp
+++ b/mrw/stacktrace.hpp
@ -20,7 +20,8 @@
 #include <sys/mman.h>
 #include <bfd.h>

-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 #ifdef _MT