From 8daa15b70e173834c9efa0b2a93e9c3642c4fdfc Mon Sep 17 00:00:00 2001
From: megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 12 Feb 2002 02:17:21 +0000
Subject: 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49692 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/io/natFileDescriptorWin32.cc | 1 +
 libjava/java/io/natFileWin32.cc           | 1 +
 2 files changed, 2 insertions(+)

(limited to 'libjava/java')

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>
-- 
cgit v1.2.3