Changeset 160

Timestamp:

Sep 22, 2010, 1:42:07 AM (15 years ago)

Author:

dmik

Message:

jdk: Fixed: WSAStartup wasn't called on OS/2.

Location:

trunk/openjdk

Files:

• hotspot/src/os/os2/vm/os_os2_init.cpp (modified) (1 diff)
• jdk/src/os2 (added)
• jdk/src/os2/native (added)
• jdk/src/os2/native/java (added)
• jdk/src/os2/native/java/net (added)
• jdk/src/os2/native/java/net/net_util_md_init.c (added)
• jdk/src/windows/native/java/net/net_util_md.c (modified) (1 diff)

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

@@ -26 +26 @@
 
 // This code redirects the OS/2 DLL initialization/termination calls to
-// the Windows DllMain()
+// the Windows DllMain() and registers the DLL with Odin
 
 #include <os2.h> // Odin32 OS/2 api wrappers

trunk/openjdk/jdk/src/windows/native/java/net/net_util_md.c

@@ -26 +26 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <memory.h>
 
 #include "net_util.h"