diff options
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 7ac6c90..174942a 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 5722330..9c88966 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 */ |