diff options
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/verify.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a6d1dad..064ef33 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 236bc4d..7ba2ba4 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> |