2002-02-06 Adam Megacz <adam@xwt.org>
+ * configure.in: Changed mingw) to *mingw*).
+ * win32.cc: Created this file.
+ * win32.h: Created this file.
+ * win32.cc, prims.cc, win32.h (win32_exception_handler): Moved
+ win32_exception_handler from prims.cc to win32.cc, added
+ header in win32.h.
+ * prims.cc: removed some #ifdef-WIN32'd headers which are no
+ longer needed now that we have platform.h
+
+2002-02-06 Adam Megacz <adam@xwt.org>
+
* shs.h, shs.cc, natSimpleSHSStream.cc: use uint<n>_t instead
of LONG and BYTE
PLATFORMOBJS=
case "$TARGET_ECOS" in
no) case "$host" in
- mingw)
+ *mingw*)
PLATFORM=Win32
PLATFORMOBJS=win32.lo
PLATFORMH=win32.h
case "${host}" in
- mingw)
+ *mingw*)
SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
;;
*)
alpha*-*-linux*)
SIGNAL_HANDLER=include/dwarf2-signal.h
;;
- mingw)
+ *mingw*)
SIGNAL_HANDLER=include/win32-signal.h
;;
*)
PLATFORMOBJS=
case "$TARGET_ECOS" in
no) case "$host" in
- mingw)
+ *mingw*)
PLATFORM=Win32
PLATFORMOBJS=win32.lo
PLATFORMH=win32.h
AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc)
case "${host}" in
- mingw)
+ *mingw*)
SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
;;
*)
alpha*-*-linux*)
SIGNAL_HANDLER=include/dwarf2-signal.h
;;
- mingw)
+ *mingw*)
SIGNAL_HANDLER=include/win32-signal.h
;;
*)
--- /dev/null
+// win32.h -- Helper functions for Microsoft-flavored OSs.
+
+/* Copyright (C) 2002 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+#ifndef __JV_WIN32_H__
+#define __JV_WIN32_H__
+
+#include <windows.h>
+#undef STRICT
+
+#undef __INSIDE_CYGWIN__
+#include <winsock.h>
+
+LONG CALLBACK win32_exception_handler (LPEXCEPTION_POINTERS e);
+
+#endif /* __JV_WIN32_H__ */
details. */
#include <config.h>
-
-#ifdef WIN32
-#include <windows.h>
-#undef STRICT
-#endif /* WIN32 */
-
-#ifdef WIN32
-#undef __INSIDE_CYGWIN__
-#include <winsock.h>
-#endif /* WIN32 */
+#include <platform.h>
#include <stdlib.h>
#include <stdarg.h>
}
}
-#ifdef WIN32
-
-extern "C" int* win32_get_restart_frame (void *);
-
-LONG CALLBACK
-win32_exception_handler (LPEXCEPTION_POINTERS e)
-{
- if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
- _Jv_ThrowNullPointerException();
- else if (e->ExceptionRecord->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
- throw new java::lang::ArithmeticException;
- else
- return EXCEPTION_CONTINUE_SEARCH;
-}
-
-#endif
-
#ifndef DISABLE_GETENV_PROPERTIES
static char *
--- /dev/null
+// win32.cc - Helper functions for Microsoft-flavored OSs.
+
+/* Copyright (C) 2002 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+#include <config.h>
+#include <windows.h>
+
+LONG CALLBACK
+win32_exception_handler (LPEXCEPTION_POINTERS e)
+{
+ if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
+ _Jv_ThrowNullPointerException();
+ else if (e->ExceptionRecord->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
+ throw new java::lang::ArithmeticException;
+ else
+ return EXCEPTION_CONTINUE_SEARCH;
+}