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

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 895286a6520c04adcb7c11bd0abd82734ba1720b..9953c4d3ece905e61139164b79bc352408e6abfe 100644 (file)
--- 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 c6851b0371c4886f98fd192b5745476cd8fb41dd..7c2bbb1b504a89bf544ae59954653d9bfd16d9ff 100644 (file)
--- 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 2ecfbf226b0cea095b65daa578316776382c0954..38927ca2481b4f0e092b7b0e3929bee87e15fc49 100644 (file)
--- 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>