* Replaced ENABLE_DEBUG with NDEBUG.

diff --git a/configure.in b/configure.in
index 77e31c8bc85f737a494a49ed8521aefb8def1a1b..51700984445c2e74dfa5208360e4383d40db1d70 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -223,7 +223,7 @@ else
 fi
 
 dnl check for dump memory usage
-AC_ARG_ENABLE([gc], [AS_HELP_STRING(--disable-dump,disable dump memory (for debugging only!) [[default=yes]])])
+AC_ARG_ENABLE([dump], [AS_HELP_STRING(--disable-dump,disable dump memory (for debugging only!) [[default=yes]])])
 
 AC_MSG_CHECKING(whether dump memory should be used)
 if test x"$enable_dump" = "xno"; then
@@ -239,9 +239,9 @@ AC_ARG_ENABLE([debug], [AS_HELP_STRING(--disable-debug,disable debug code genera
 AC_MSG_CHECKING(whether debug code generation should be enabled)
 if test x"$enable_debug" = "xno"; then
        AC_MSG_RESULT(no)
+       AC_DEFINE([NDEBUG], 1, [disable debug code])
 else
        AC_MSG_RESULT(yes)
-       AC_DEFINE([ENABLE_DEBUG], 1, [enable debug code])
 fi
 
 dnl check for statistics

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index ff376e681745a6ad330ba68f4e971bc7e41b1bbf..2d0867ecf4d0686c4f9370b42606092758ad2f27 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: cacao.c 3937 2005-12-10 23:59:04Z twisti $
+   $Id: cacao.c 3940 2005-12-11 01:06:16Z twisti $
 
 */
 
@@ -1600,7 +1600,7 @@ void exit_handler(void)
 {
        /********************* Print debug tables ************************/
 
-#if defined(ENABLE_DEBUG)
+#if !defined(NDEBUG)
        if (showmethods)
                class_showmethods(mainclass);
 

diff --git a/src/vm/class.c b/src/vm/class.c
index 219ed6645d87f201cf31b00d1eab723c9c0d62f7..215d60d0761988257b9534cc71c3ed1bd8cdf66d 100644 (file)
--- a/src/vm/class.c
+++ b/src/vm/class.c
@@ -30,7 +30,7 @@
             Andreas Krall
             Christian Thalinger
 
-   $Id: class.c 3888 2005-12-05 22:08:45Z twisti $
+   $Id: class.c 3940 2005-12-11 01:06:16Z twisti $
 
 */
 
@@ -1150,7 +1150,7 @@ bool class_issubclass(classinfo *sub, classinfo *super)
 }
 
 
-#if defined(ENABLE_DEBUG)
+#if !defined(NDEBUG)
 void class_showconstanti(classinfo *c, int ii) 
 {
        u4 i = ii;
@@ -1356,7 +1356,7 @@ void class_showmethods (classinfo *c)
                }
 
 }
-#endif /* defined(ENABLE_DEBUG) */
+#endif /* !defined(NDEBUG) */
 
 
 /*

diff --git a/src/vm/field.c b/src/vm/field.c
index b8cbc21d23c312bec7b6919c7025c3f9a021ad22..c0d43e57656d71318f6a46409ecae262e5269ab6 100644 (file)
--- a/src/vm/field.c
+++ b/src/vm/field.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: field.c 3856 2005-12-03 12:41:44Z twisti $
+   $Id: field.c 3940 2005-12-11 01:06:16Z twisti $
 
 */
 
@@ -62,7 +62,7 @@ void field_free(fieldinfo *f)
 
 *******************************************************************************/
 
-#if defined(ENABLE_DEBUG)
+#if !defined(NDEBUG)
 void field_display(fieldinfo *f)
 {
        printf("   ");

diff --git a/src/vm/field.h b/src/vm/field.h
index 1ad00ae643bd021d54ff5b5bac619238b25b5803..254adcc78140eff8667deebfb8be2e40d6ba77f4 100644 (file)
--- a/src/vm/field.h
+++ b/src/vm/field.h
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: field.h 3857 2005-12-03 12:43:29Z twisti $
+   $Id: field.h 3940 2005-12-11 01:06:16Z twisti $
 */
 
 
@@ -74,7 +74,7 @@ struct fieldinfo {          /* field of a class                                 */
 
 void field_free(fieldinfo *f);
 
-#if defined(ENABLE_DEBUG)
+#if !defined(NDEBUG)
 void field_display(fieldinfo *f);
 #endif
 

diff --git a/src/vm/jit/inline/sets.c b/src/vm/jit/inline/sets.c
index 48bd0a83b9374e1ddc1e1659d93af16c430669c0..4e1ddf3edbee0f203ad6a3af38b3496dd7317bb5 100644 (file)
--- a/src/vm/jit/inline/sets.c
+++ b/src/vm/jit/inline/sets.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: sets.c 3853 2005-12-03 12:34:42Z twisti $
+   $Id: sets.c 3940 2005-12-11 01:06:16Z twisti $
 
 */
 
@@ -385,7 +385,7 @@ int sizeOfSet(classSetNode *s) {
 }
 
 
-#if defined(ENABLE_DEBUG)  
+#if !defined(NDEBUG)  
 /*------------------------------------------------------------*/
 int printSet(classSetNode *s)
 {
@@ -516,7 +516,7 @@ int printFieldSet(fldSet *sf) {
 }
 /*------------------------------------------------------------*/
 /*void destroy_set */
-#endif /* defined(ENABLE_DEBUG) */
+#endif /* !defined(NDEBUG) */
 
 
 /*

diff --git a/src/vm/utf8.c b/src/vm/utf8.c
index e3efb4062212f7a9d3cca65874f1079b0538335e..caf508321697962e2c60c971a5d9337e2dfd6db7 100644 (file)
--- a/src/vm/utf8.c
+++ b/src/vm/utf8.c
@@ -30,7 +30,7 @@
             Andreas Krall
             Christian Thalinger
 
-   $Id: utf8.c 3935 2005-12-10 23:55:49Z twisti $
+   $Id: utf8.c 3940 2005-12-11 01:06:16Z twisti $
 
 */
 
@@ -1130,7 +1130,7 @@ bool is_valid_name_utf(utf *u)
 
 *******************************************************************************/
 
-#if defined(ENABLE_DEBUG)
+#if !defined(NDEBUG)
 void utf_show(void)
 {
 
@@ -1214,7 +1214,7 @@ void utf_show(void)
        /* avg. chainlength = sum of chainlengths / number of chains */
        printf("avg. chainlength:%5.2f\n",(float) sum_chainlength / (hashtable_utf.size-chain_count[0]));
 }
-#endif /* defined(ENABLE_DEBUG) */
+#endif /* !defined(NDEBUG) */
 
 
 /*