Quick fix to avoid unnecessary compiler warnings from duplicate __WXDEBUG__ defines.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index 21a7cbc971ce02acda7a5e1672262127ad1e64b3..d7db7f05e29940c05e82e100784838158b85691c 100644 (file)
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -947,7 +947,6 @@ AC_SUBST(WXDEBUG)
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
   AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
   AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)

-  AC_DEFINE_UNQUOTED(__WXDEBUG__,$USE_DEBUG_FLAG)

   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)
 fi
   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)
 fi

diff --git a/src/gtk/setup/setup.hin b/src/gtk/setup/setup.hin
index 1579f25a23159a5260b6dd7c7e94d7faefb291da..8547dcf6ec9d2eccb6b05efb5e766bd791363a2a 100644 (file)
--- a/src/gtk/setup/setup.hin
+++ b/src/gtk/setup/setup.hin
@@ -194,10 +194,6 @@
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 #undef WXDEBUG
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 #undef WXDEBUG

-/*
- * Enables debugging: memory tracing, assert, etc., undefined if no debugging
- */
-#undef __WXDEBUG__

 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially
 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially

diff --git a/src/gtk1/setup/setup.hin b/src/gtk1/setup/setup.hin
index 1579f25a23159a5260b6dd7c7e94d7faefb291da..8547dcf6ec9d2eccb6b05efb5e766bd791363a2a 100644 (file)
--- a/src/gtk1/setup/setup.hin
+++ b/src/gtk1/setup/setup.hin
@@ -194,10 +194,6 @@
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 #undef WXDEBUG
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 #undef WXDEBUG

-/*
- * Enables debugging: memory tracing, assert, etc., undefined if no debugging
- */
-#undef __WXDEBUG__

 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially
 /*
  * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
  * WARNING: this code may not work with all architectures, especially