From 6d829370c0470d0bb18115d85f8bd4711a48d778 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam@xwt.org>
Date: Sat, 2 Feb 2002 04:37:54 +0000
Subject: [PATCH] prims.cc: Added #undef STRICT after #include<windows.h>.

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

	* prims.cc: Added #undef STRICT after #include<windows.h>.

From-SVN: r49430
---
 libjava/ChangeLog | 6 +++++-
 libjava/prims.cc  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index baabfcd5180..cf0d9d24e15 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,10 +1,14 @@
+2002-02-01  Adam Megacz <adam@xwt.org>
+
+	* prims.cc: Added #undef STRICT after #include<windows.h>.
+	
 2002-02-01  Adam Megacz <adam@xwt.org>
 
 	* prims.cc
 	(_Jv_CreateJavaVM): We now use WIN32 instead of
 	USE_WIN32_SIGNALLING and USE_WINSOCK.
 	(win32_exception_handler): Now throws an exception out of
-	the signal handler; assumes SJLJ
+	the signal handler; assumes SJLJ.
 	
 2002-02-01  Adam Megacz
 
diff --git a/libjava/prims.cc b/libjava/prims.cc
index 23ee38d5060..55e6da4959a 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -12,6 +12,7 @@ details.  */
 
 #ifdef WIN32
 #include <windows.h>
+#undef STRICT
 #endif /* WIN32 */
 
 #ifdef WIN32