From: Adam Megacz <adam@xwt.org>
Date: Tue, 12 Feb 2002 02:17:21 +0000 (+0000)
Subject: natFileWin32.cc, [...]: Added #undef STRICT to make windows.h and java/lang/reflect... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30529b03fddc4eb205d5b7f6e8e3ad08643547ce;p=gcc.git

natFileWin32.cc, [...]: Added #undef STRICT to make windows.h and java/lang/reflect/Modifier.h cooperate.

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

    * java/io/natFileWin32.cc, java/io/natFileDescriptorWin32.cc:
    Added #undef STRICT to make windows.h and
    java/lang/reflect/Modifier.h cooperate.

From-SVN: r49692
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 895286a6520..9953c4d3ece 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-11  Adam Megacz <adam@xwt.org>
+
+	* java/io/natFileWin32.cc, java/io/natFileDescriptorWin32.cc:
+	Added #undef STRICT to make windows.h and
+	java/lang/reflect/Modifier.h cooperate.
+
 2002-02-11  Adam Megacz <adam@xwt.org>
 
 	* java/io/natFileWin32.cc: Created a placeholder class with lots
diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc
index c6851b0371c..7c2bbb1b504 100644
--- a/libjava/java/io/natFileDescriptorWin32.cc
+++ b/libjava/java/io/natFileDescriptorWin32.cc
@@ -17,6 +17,7 @@ details.  */
 #include <string.h>
 
 #include <windows.h>
+#undef STRICT
 
 #include <gcj/cni.h>
 #include <jvm.h>
diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc
index 2ecfbf226b0..38927ca2481 100644
--- a/libjava/java/io/natFileWin32.cc
+++ b/libjava/java/io/natFileWin32.cc
@@ -14,6 +14,7 @@ details.  */
 #include <string.h>
 
 #include <windows.h>
+#undef STRICT
 
 #include <gcj/cni.h>
 #include <jvm.h>