Tom Tromey wrote: > A couple of the headers are installed, but this symbol isn't used by > any of them. So, without the underscores is ok. It doesn't matter > hugely to me, though, so if you already have the patch, the underscore > variant is fine too. Well, as it happens :) libjava/ChangeLog * interpret.cc (DEBUG): Rename this ... (__GCJ_DEBUG): ... to this throughout. * interpret-run.cc: Likewise. * prims.cc: Likewise. * configure.ac: Likewise. * classpath/configure.ac: Likewise. * classpath/native/jni/classpath/jcl.h: Likewise. * classpath/native/jni/java-lang/java_lang_VMDouble.c: Likewise. * classpath/native/jni/java-net/gnu_java_net_local_LocalSocketImpl.c: Likewise. * classpath/native/jni/java-math/gnu_java_math_GMP.c: Likewise. * classpath/native/fdlibm/mprec.c: Likewise. * classpath/native/fdlibm/mprec.h: Likewise. * classpath/native/fdlibm/dtoa.c: Likewise. * gnu/classpath/natConfiguration.cc: Likewise. * include/java-assert.h: Likewise. * java/io/natVMObjectInputStream.cc: Likewise. * configure: Regenerate. * classpath/configure: Regenerate. * include/config.h.in: Regenerate. * classpath/include/config.h.in: Regenerate. Tested by seeing bootstrap run to completion on i686-pc-cygwin, and then seeing lots of debug output from the run of gcj-dbtool to generate classmap.db. Ok? cheers, DaveK