Merge
authorlana
Sat, 18 Jun 2011 10:12:58 -0700
changeset 9863 5f44e9dc3049
parent 9860 680bc8cf0b9c (current diff)
parent 9862 ee7353e276a1 (diff)
child 9864 35cf247992f0
Merge
--- a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Fri Jun 17 16:25:01 2011 -0700
+++ b/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Sat Jun 18 10:12:58 2011 -0700
@@ -44,7 +44,7 @@
 #define SO_UPDATE_CONNECT_CONTEXT 0x7010
 #endif
 
-typedef BOOL (*ConnectEx_t)
+typedef BOOL (PASCAL *ConnectEx_t)
 (
     SOCKET s,
     const struct sockaddr* name,