diff options
| author | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-05 01:59:44 +0000 |
|---|---|---|
| committer | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-05 01:59:44 +0000 |
| commit | f1714310544ff7ab25f0413c194bf9f5652dea53 (patch) | |
| tree | ea93154ce510b6114e9e156fce587f8768132408 /libjava | |
| parent | 39c21f73eaab0ecff95a831a5b8dc36b30b7a020 (diff) | |
| download | ppe42-gcc-f1714310544ff7ab25f0413c194bf9f5652dea53.tar.gz ppe42-gcc-f1714310544ff7ab25f0413c194bf9f5652dea53.zip | |
2002-02-04 Adam Megacz <adam@xwt.org>
* win32-threads.cc: #undef STRICT after gc.h inclusion
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49506 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/win32-threads.cc | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7ac6c900492..174942ab597 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2002-02-04 Adam Megacz <adam@xwt.org> + + * win32-threads.cc: #undef STRICT after gc.h inclusion + 2002-02-02 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. diff --git a/libjava/win32-threads.cc b/libjava/win32-threads.cc index 57223305649..9c889663db8 100644 --- a/libjava/win32-threads.cc +++ b/libjava/win32-threads.cc @@ -16,6 +16,8 @@ details. */ extern "C" { #include <gc.h> +// <windows.h> #define's STRICT, which conflicts with Modifier.h +#undef STRICT }; #endif /* HAVE_BOEHM_GC */ |
