win32-threads.cc: #undef STRICT after gc.h inclusion

2002-02-04  Adam Megacz <adam@xwt.org>

        * win32-threads.cc: #undef STRICT after gc.h inclusion

From-SVN: r49506

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7ac6c90049292698d7d11c47e934bc3b88385be4..174942ab5976f1daeb8391663bc90ef1ef8d27d5 100644 (file)
--- 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 57223305649cb07251ccdfa829226e891521c98c..9c889663db862b3cb74ca24d24e749d0b700e9d7 100644 (file)
--- 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 */