Change EVENT_BASE_FREE_FIX for EVENTXX_BASE_FREE_FIX.

It's better to have some kind of namespace for compiler flags too.

diff --git a/Doxyfile b/Doxyfile
index fb7c0141390743f594424f0ef7d8c6f83448eba0..ba9978d666fd91b4480fd2242ac83f661159085a 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1013,7 +1013,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = EVENT_BASE_FREE_FIX
+PREDEFINED             = EVENTXX_BASE_FREE_FIX
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/eventxx b/eventxx
index 7dd8c48e676cea39dd25a223d31db93a20dfa835..e2391b5026263fc81717360f065f71b0a66cdcec 100644 (file)
--- a/eventxx
+++ b/eventxx
@@ -142,8 +142,8 @@
  * patch your libevent (for example, using this <a
  * href="http://monkeymail.org/archives/libevent-users/2006-April/000141.html">patch</a>
  * written by Mark D. Anderson, and who knows why it's not still applied). If
- * you do so, you can compile your programs with @c -DEVENT_BASE_FREE_FIX so
- * @c event_base_free() gets called in the eventxx::dispatcher @link
+ * you do so, you can compile your programs with @c -DEVENTXX_EVENT_BASE_FREE_FIX
+ * so @c event_base_free() gets called in the eventxx::dispatcher @link
  * eventxx::dispatcher::~dispatcher() destructor @endlink.
  *
  * That said, I think it's still pretty usable anyways. If something is broken
@@ -791,14 +791,14 @@ struct dispatcher
                internal::event_base_priority_init(_event_base, npriorities);
        }
 
-#ifdef EVENT_BASE_FREE_FIX
+#ifdef EVENTXX_BASE_FREE_FIX
        /// Free dispatcher resources, see @ref Status section for details.
        ~dispatcher() throw() { event_base_free(_event_base); }
 #else
 #warning "The dispatcher class *will* leak memory because of a libevent bug, " \
     "see http://www.mail-archive.com/libevent-users@monkey.org/msg00110.html " \
     "for more info an a patch. If you already have this patch, please " \
-    "-DEVENT_BASE_FREE_FIX to your compiler to make this message disappear " \
+    "-DEVENTXX_EVENT_BASE_FREE_FIX to your compiler to make this message disappear " \
     "and really free the dispatcher memory using event_base_free()."
 #endif
 

diff --git a/test/Makefile b/test/Makefile
index 477a59142195319cf4c60d550dcbe7c8442c2ea5..1519df2696f7dc8c485464252ff94263e03ee16b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@
 CXXFLAGS=-I.. -g -Wall
 # Uncomment this if you have a fixed event_base_free().
 # See http://www.mail-archive.com/libevent-users@monkey.org/msg00112.html
-#CXXFLAGS+=-DEVENT_BASE_FREE_FIX
+#CXXFLAGS+=-DEVENTXX_EVENT_BASE_FREE_FIX
 LDFLAGS=-levent
 
 targets=bench test-eof test-time test-weof trivial c-way functor-way \