[committed] Fix PR libgcj/31084

John David Anglin dave@hiauly1.hia.nrc.ca
Wed Apr 25 01:33:00 GMT 2007

This patch fixes PR libgcj/31084 by reordering the includes in
java/lang/natVMProcess.cc.  As a result, the HP include file
sys/rw_lock.h is included before gcj/javaprims.h.  This works
around the TRUE/FALSE hack in javaprims.h.

Tested on hppa2.0w-hp-hpux11.11 and hppa-unknown-linux-gnu.

J. David Anglin                                  dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)

2007-04-24  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>

	PR libgcj/31084
	* java/lang/natVMProcess.cc: Include platform.h before jvm.h.

Index: java/lang/natVMProcess.cc
--- java/lang/natVMProcess.cc	(revision 124014)
+++ java/lang/natVMProcess.cc	(working copy)
@@ -10,11 +10,10 @@
 #include <config.h>
-#include <gcj/cni.h>
-#include <jvm.h>
 #include <platform.h>
+#include <jvm.h>
 #include <java/lang/VMProcess.h>
 #include <java/lang/Process.h>
 #include <java/io/File.h>

More information about the Java-patches mailing list