diff options
| author | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-02 04:37:54 +0000 |
|---|---|---|
| committer | megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-02 04:37:54 +0000 |
| commit | 786423b2be6f00af5454f0ad6d09423b3b388c0a (patch) | |
| tree | 0b23ced6d00c1fee20e829b153f18d070def1c4f /libjava | |
| parent | f9f038908e7d7b2390f87de471b38fd7cf79ce2e (diff) | |
| download | ppe42-gcc-786423b2be6f00af5454f0ad6d09423b3b388c0a.tar.gz ppe42-gcc-786423b2be6f00af5454f0ad6d09423b3b388c0a.zip | |
2002-02-01 Adam Megacz <adam@xwt.org>
* prims.cc: Added #undef STRICT after #include<windows.h>.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49430 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/prims.cc | 1 |
2 files changed, 6 insertions, 1 deletions
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 |
