Changeset 246

Timestamp:

Jan 26, 2011, 9:56:26 PM (15 years ago)

Author:

dmik

Message:

all: Use os2wrap.h instead of os2.h to make sure that all OS/2 APIs are called through wrappers that save/restore the FS register (fixes spontaneous crashes inside JVM.DLL like in #47).

Location:

trunk/openjdk

Files:

• hotspot/src/os/os2/vm/os_os2_init.cpp (modified) (1 diff)
• jdk/src/os2/native/java/net/net_util_md_init.c (modified) (1 diff)
• jdk/src/os2/native/sun/font/fontpath_os2.c (modified) (1 diff)
• jdk/src/os2/native/sun/os2/awt_init.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp

@@ -28 +28 @@
 // the Windows DllMain() and registers the DLL with Odin
 
-#include <os2.h> // Odin32 OS/2 api wrappers
+#include <os2wrap.h> // Odin32 OS/2 api wrappers
 #include <odinlx.h>
 #include <misc.h>

trunk/openjdk/jdk/src/os2/native/java/net/net_util_md_init.c

@@ -29 +29 @@
 // the Windows DllMain() and registers the DLL with Odin
 
-#include <os2.h> // Odin32 OS/2 api wrappers
+#include <os2wrap.h> // Odin32 OS/2 api wrappers
 #include <odinlx.h>
 #include <misc.h>

trunk/openjdk/jdk/src/os2/native/sun/font/fontpath_os2.c

@@ -28 +28 @@
 #define OS2EMX_PLAIN_CHAR
 #define INCL_WINSHELLDATA
-#include <os2.h>
+#include <os2wrap.h> // Odin32 OS/2 api wrappers
 
 #include <malloc.h>

trunk/openjdk/jdk/src/os2/native/sun/os2/awt_init.cpp

@@ -30 +30 @@
 
 #define INCL_DOSPROCESS
-#include <os2.h> // Odin32 OS/2 api wrappers
+#include <os2wrap.h> // Odin32 OS/2 api wrappers
 #include <odinlx.h>
 #include <misc.h>