* interpret.cc (DEBUG): Rename this ...

	(__GCJ_DEBUG):  ... to this throughout.
	* configure.ac:  Likewise.
	* interpret-run.cc:  Likewise.
	* prims.cc:  Likewise.
	* gnu/classpath/natConfiguration.cc:  Likewise.
	* include/java-assert.h:  Likewise.
	* java/io/natVMObjectInputStream.cc:  Likewise.

	* configure:  Regenerate.
	* include/config.h.in:  Regenerate.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146869 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 38 insertions, 24 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 088f5d4ab19..1dfd38fe652 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,19 @@
 2009-04-28  Dave Korn  <dave.korn.cygwin@gmail.com>
 
+	* interpret.cc (DEBUG):  Rename this ...
+	(__GCJ_DEBUG):  ... to this throughout.
+	* configure.ac:  Likewise.
+	* interpret-run.cc:  Likewise.
+	* prims.cc:  Likewise.
+	* gnu/classpath/natConfiguration.cc:  Likewise.
+	* include/java-assert.h:  Likewise.
+	* java/io/natVMObjectInputStream.cc:  Likewise.
+
+	* configure:  Regenerate.
+	* include/config.h.in:  Regenerate.
+
+2009-04-28  Dave Korn  <dave.korn.cygwin@gmail.com>
+
 	* java/lang/natVMClassLoader.cc
 	(java::lang::VMClassLoader::defineClass):  Fix assert.
 
diff --git a/libjava/configure b/libjava/configure
index ffb46822ed7..b2c24670474 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -5268,7 +5268,7 @@ if test "${enable_libgcj_debug+set}" = set; then
   if test "$enable_libgcj_debug" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
+#define __GCJ_DEBUG 1
 _ACEOF
 
     LIBGCJDEBUG="enable"
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 05d2371724d..c57356a8cde 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -244,7 +244,7 @@ AC_ARG_ENABLE(libgcj-debug,
   AS_HELP_STRING([--enable-libgcj-debug],
                  [enable runtime debugging code]),
   [if test "$enable_libgcj_debug" = yes; then
-    AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.])
+    AC_DEFINE(__GCJ_DEBUG, 1, [Define this if you want runtime debugging enabled.])
     LIBGCJDEBUG="enable"
   fi])
 
diff --git a/libjava/gnu/classpath/natConfiguration.cc b/libjava/gnu/classpath/natConfiguration.cc
index 06f119c2b97..b7b8161e709 100644
--- a/libjava/gnu/classpath/natConfiguration.cc
+++ b/libjava/gnu/classpath/natConfiguration.cc
@@ -25,7 +25,7 @@ gnu::classpath::Configuration::classpath_home()
 jboolean
 gnu::classpath::Configuration::debug()
 {
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
   return true;
 #else
   return false;
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in
index 3fdde3944f2..b81e0d3e1f4 100644
--- a/libjava/include/config.h.in
+++ b/libjava/include/config.h.in
@@ -3,9 +3,6 @@
 /* Name of default AWT toolkit */
 #undef AWT_TOOLKIT
 
-/* Define this if you want runtime debugging enabled. */
-#undef DEBUG
-
 /* Define if system properties shouldn't be read from
    getenv("GCJ_PROPERTIES"). */
 #undef DISABLE_GETENV_PROPERTIES
@@ -457,5 +454,8 @@
 /* Required define if using POSIX threads */
 #undef _REENTRANT
 
+/* Define this if you want runtime debugging enabled. */
+#undef __GCJ_DEBUG
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef ssize_t
diff --git a/libjava/include/java-assert.h b/libjava/include/java-assert.h
index 6f178bd9e98..57962418b7d 100644
--- a/libjava/include/java-assert.h
+++ b/libjava/include/java-assert.h
@@ -16,7 +16,7 @@ details.  */
 void _Jv_Abort (const char *, const char *, int, const char *)
   __attribute__ ((__noreturn__));
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
 #define _Jv_AssertDoCall(Message) _Jv_Abort (__FUNCTION__, __FILE__, __LINE__, Message)
 
 #define JvAssertMessage(Expr, Message) \
@@ -26,13 +26,13 @@ void _Jv_Abort (const char *, const char *, int, const char *)
 
 #define JvFail(Message) _Jv_AssertDoCall (Message)
 
-#else /* DEBUG */
+#else /* __GCJ_DEBUG */
 
 #define _Jv_AssertDoCall(Message)
 #define JvAssertMessage(Expr, Message)
 #define JvAssert(Expr)
 #define JvFail(Message) _Jv_Abort (0, 0, 0, Message)
 
-#endif /* not DEBUG */
+#endif /* not __GCJ_DEBUG */
 
 #endif /* __JAVA_ASSERT_H__ */
diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc
index 059195360ed..a4c2d4dab43 100644
--- a/libjava/interpret-run.cc
+++ b/libjava/interpret-run.cc
@@ -23,7 +23,7 @@ details.  */
   // returns.
   java::lang::Thread *thread = java::lang::Thread::currentThread();
   
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
   _Jv_InterpFrame frame_desc (meth, thread, NULL, &pc);
 #else
   _Jv_InterpFrame frame_desc (meth, thread);
@@ -38,7 +38,7 @@ details.  */
 
   _Jv_word locals[meth->max_locals];
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
   // This is the information needed to get and set local variables with
   // proper type checking.
   frame_desc.locals = locals;
@@ -126,7 +126,7 @@ details.  */
           continue;
         }
     }
-#endif /* DEBUG */
+#endif /* __GCJ_DEBUG */
 
 #define INSN_LABEL(op) &&insn_##op
 
@@ -347,7 +347,7 @@ details.  */
 
 #ifdef DIRECT_THREADED
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
 #undef NEXT_INSN
 #define NEXT_INSN							\
   do									\
@@ -392,7 +392,7 @@ details.  */
 
 #undef INTERP_REPORT_EXCEPTION
 #define INTERP_REPORT_EXCEPTION(Jthrowable) REPORT_EXCEPTION (Jthrowable)
-#else // !DEBUG
+#else // !__GCJ_DEBUG
 #undef NEXT_INSN
 #define NEXT_INSN goto *((pc++)->insn)
 
@@ -416,7 +416,7 @@ details.  */
 
 #undef INTERP_REPORT_EXCEPTION
 #define INTERP_REPORT_EXCEPTION(Jthrowable) /* not needed when not debugging */
-#endif // !DEBUG
+#endif // !__GCJ_DEBUG
 
 #define INTVAL() ((pc++)->int_val)
 #define AVAL() ((pc++)->datum)
@@ -450,7 +450,7 @@ details.  */
 
 #else
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
 #define NEXT_INSN							\
   do									\
     {									\
@@ -2677,7 +2677,7 @@ details.  */
         {
           sp = stack;
           sp++->o = ex; // Push exception.
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
           if (JVMTI_REQUESTED_EVENT (ExceptionCatch))
             {
               using namespace gnu::gcj::jvmti;
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index dc1114f65f1..3f690d7b27c 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -983,7 +983,7 @@ void
 _Jv_InterpMethod::run (void *retp, INTERP_FFI_RAW_TYPE *args,
 		       _Jv_InterpMethod *meth)
 {
-#undef DEBUG
+#undef __GCJ_DEBUG
 #undef DEBUG_LOCALS_INSN
 #define DEBUG_LOCALS_INSN(s, t) do {} while (0)
 
@@ -994,7 +994,7 @@ void
 _Jv_InterpMethod::run_debug (void *retp, INTERP_FFI_RAW_TYPE *args,
 			     _Jv_InterpMethod *meth)
 {
-#define DEBUG
+#define __GCJ_DEBUG
 #undef DEBUG_LOCALS_INSN
 #define DEBUG_LOCALS_INSN(s, t)  \
   do    \
@@ -1719,7 +1719,7 @@ throw_class_format_error (const char *msg)
    CATCH_LOCATION with the method and location where the catch will
    occur. If the exception is not caught, these are set to 0.
 
-   This function should only be used with the DEBUG interpreter. */
+   This function should only be used with the __GCJ_DEBUG interpreter. */
 static void
 find_catch_location (::java::lang::Throwable *exc, jthread thread,
 		     jmethodID *catch_method, jlong *catch_loc)
@@ -1751,7 +1751,7 @@ find_catch_location (::java::lang::Throwable *exc, jthread thread,
    caught (if it is caught).
    
    Like find_catch_location, this should only be called with the
-   DEBUG interpreter. Since a few exceptions occur outside the
+   __GCJ_DEBUG interpreter. Since a few exceptions occur outside the
    interpreter proper, it is important to not call this function
    without checking JVMTI_REQUESTED_EVENT(Exception) first. */
 void
diff --git a/libjava/java/io/natVMObjectInputStream.cc b/libjava/java/io/natVMObjectInputStream.cc
index 86410a4e76b..eccf0eb0255 100644
--- a/libjava/java/io/natVMObjectInputStream.cc
+++ b/libjava/java/io/natVMObjectInputStream.cc
@@ -26,7 +26,7 @@ details.  */
 #include <java/lang/reflect/Method.h>
 #include <java-stack.h>
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
 #include <java/lang/System.h>
 #include <java/io/PrintStream.h>
 #endif
diff --git a/libjava/prims.cc b/libjava/prims.cc
index d94cd92cbc7..90f8dc5ca23 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -460,7 +460,7 @@ _Jv_makeUtf8Const (jstring string)
 
 
 
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
 void
 _Jv_Abort (const char *function, const char *file, int line,
 	   const char *message)
@@ -469,7 +469,7 @@ void
 _Jv_Abort (const char *, const char *, int, const char *message)
 #endif
 {
-#ifdef DEBUG
+#ifdef __GCJ_DEBUG
   fprintf (stderr,
 	   "libgcj failure: %s\n   in function %s, file %s, line %d\n",
 	   message, function, file, line);