From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date: Fri, 19 Mar 2004 17:38:23 +0000 (+0000)
Subject: * verify.cc: Undef PC.
X-Git-Tag: releases/gcc-4.0.0~9300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=165c9b0468d5386d22855dd5f70340dad2aa8f78;p=thirdparty%2Fgcc.git

* verify.cc: Undef PC.

From-SVN: r79690
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a6d1dadab30c..064ef338270c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* verify.cc: Undef PC.
+
 2004-03-18  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/channels/spi/AbstractSelectableChannel.java
diff --git a/libjava/verify.cc b/libjava/verify.cc
index 236bc4dcebfe..7ba2ba4daee5 100644
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -19,6 +19,11 @@ details.  */
 #include <java-insns.h>
 #include <java-interp.h>
 
+// On Solaris 10/x86, <signal.h> indirectly includes <ia32/sys/reg.h>, which 
+// defines PC since g++ predefines __EXTENSIONS__.  Undef here to avoid clash
+// with PC member of class _Jv_BytecodeVerifier below.
+#undef PC
+
 #ifdef INTERPRETER
 
 #include <java/lang/Class.h>