diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2004-03-19 17:40:03 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2004-03-19 17:40:03 +0000 |
| commit | 3c534202a8949f993b7f6e02c1285eace17c65bb (patch) | |
| tree | 46e22fd9a9c3d18afdfab794b99831ce9dac82ed /libjava | |
| parent | a9e43196ae4a388c83b6f8428ff3b80fe8d54d00 (diff) | |
* verify.cc: Undef PC.
From-SVN: r79691
Diffstat (limited to 'libjava')
| -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 5ac7fccd32c..59f5bd43dc6 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-11 Alan Modra <amodra@bigpond.net.au> * include/powerpc-signal.h: Revert 2004-01-21 change. diff --git a/libjava/verify.cc b/libjava/verify.cc index f91df81cde1..64efc3033f1 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> |