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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49566 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 71bfac6..203c773 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,16 @@
 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
        

diff --git a/libjava/configure b/libjava/configure
index d43c032..68cb751 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -2864,7 +2864,7 @@ fi
 PLATFORMOBJS=
 case "$TARGET_ECOS" in
    no) case "$host" in
-      mingw)
+      *mingw*)
             PLATFORM=Win32
             PLATFORMOBJS=win32.lo
            PLATFORMH=win32.h
@@ -3072,7 +3072,7 @@ test -d java/lang || mkdir java/lang
 
 
 case "${host}" in
-    mingw)
+    *mingw*)
       SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
     ;;
     *)
@@ -6388,7 +6388,7 @@ case "${host}" in
  alpha*-*-linux*)
     SIGNAL_HANDLER=include/dwarf2-signal.h
     ;;
- mingw)
+ *mingw*)
     SIGNAL_HANDLER=include/win32-signal.h
     ;;
  *)

diff --git a/libjava/configure.in b/libjava/configure.in
index 12f1775..f082f62 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -204,7 +204,7 @@ TARGET_ECOS="$with_ecos"
 PLATFORMOBJS=
 case "$TARGET_ECOS" in
    no) case "$host" in
-      mingw)
+      *mingw*)
             PLATFORM=Win32
             PLATFORMOBJS=win32.lo
            PLATFORMH=win32.h
@@ -250,7 +250,7 @@ AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java)
 AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc)
 
 case "${host}" in
-    mingw)
+    *mingw*)
       SYSTEMSPEC="-lgdi32 -lwsock32 -lws2_32"
     ;;
     *)
@@ -852,7 +852,7 @@ case "${host}" in
  alpha*-*-linux*)
     SIGNAL_HANDLER=include/dwarf2-signal.h
     ;;
- mingw)
+ *mingw*)
     SIGNAL_HANDLER=include/win32-signal.h
     ;;
  *)

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
new file mode 100644 (file)
index 0000000..677f5d3
--- /dev/null
+++ b/libjava/include/win32.h
@@ -0,0 +1,22 @@
+// 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__ */

diff --git a/libjava/prims.cc b/libjava/prims.cc
index ec6263c..995206c 100644 (file)
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -9,16 +9,7 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 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>
@@ -731,23 +722,6 @@ _Jv_ThisExecutable (const char *name)
     }
 }
 
-#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 *

diff --git a/libjava/win32.cc b/libjava/win32.cc
new file mode 100644 (file)
index 0000000..daccf0f
--- /dev/null
+++ b/libjava/win32.cc
@@ -0,0 +1,23 @@
+// 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;
+}