diff options
| -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 baabfcd5..cf0d9d2 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 23ee38d..55e6da4 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 |