* verify.cc: Undef PC.

From-SVN: r79690

* verify.cc: Undef PC.
From-SVN: r79690
165c9b04 · Rainer Orth · Rainer Orth · 59d35672 · 165c9b04 · 165c9b04
Commit 165c9b04 authored Mar 19, 2004 by Rainer Orth Committed by Rainer Orth Mar 19, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

libjava/ChangeLog
+4 -0

libjava/verify.cc
+5 -0

No files found.
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
+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

--- 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>