diff options
| author | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-12 02:17:21 +0000 |
|---|---|---|
| committer | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-12 02:17:21 +0000 |
| commit | 8daa15b70e173834c9efa0b2a93e9c3642c4fdfc (patch) | |
| tree | 728b7d9c20b5889eb1c4fc967214a4e4c9d9d2da /libjava | |
| parent | 472b2f1e420f237b942deb08414d7b75166c4da4 (diff) | |
| download | gcc-8daa15b70e173834c9efa0b2a93e9c3642c4fdfc.tar.gz | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorWin32.cc | 1 | ||||
| -rw-r--r-- | libjava/java/io/natFileWin32.cc | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 895286a6520..9953c4d3ece 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 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 of FIXMEs. 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> |