diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-19 17:38:23 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-19 17:38:23 +0000 |
| commit | a6578b5f1fabbcd9304f8ad1142413590eb9484a (patch) | |
| tree | fbabe86a4fb29f6a4398f2316d71c78592a888d0 /libjava | |
| parent | ddacde3a1253c1873c32ac88fa10693677a919c3 (diff) | |
| download | ppe42-gcc-a6578b5f1fabbcd9304f8ad1142413590eb9484a.tar.gz ppe42-gcc-a6578b5f1fabbcd9304f8ad1142413590eb9484a.zip | |
* verify.cc: Undef PC.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79690 138bc75d-0d04-0410-961f-82ee72b054a4
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 a6d1dadab30..064ef338270 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 236bc4dcebf..7ba2ba4daee 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> |
