* verify.cc: Undef PC.

From-SVN: r79690

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a6d1dadab30c251c7540381d245dffcd796b164a..064ef338270c4dfb1a1b441ffe78e8c411617b04 100644 (file)
--- 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 236bc4dcebfe6a4ae02f6b16e130bcc7bf31d9d2..7ba2ba4daee54cdf0a51263c3171025a36bb3b9d 100644 (file)
--- 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>