OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.in: Changed mingw) to *mingw*). 

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

From-SVN: r49566
This commit is contained in:
Adam Megacz 2002-02-07 05:26:42 +00:00 committed by Adam Megacz
parent df79080e5f
commit b8fe3c1e06
6 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
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

6
libjava/configure vendored
View File

@ -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
;;
*)

6
libjava/configure.in
View File

@ -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
;;
*)

22
libjava/include/win32.h Normal file
View File

@ -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__ */

28
libjava/prims.cc
View File

@ -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 *

23
libjava/win32.cc Normal file
View File

@ -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;
}