Merge
authorlana
Fri, 17 Jun 2011 10:27:40 -0700
changeset 9862 ee7353e276a1
parent 9858 0bf9c4c0619f (current diff)
parent 9861 d45e2e8fbefa (diff)
child 9863 5f44e9dc3049
Merge
--- a/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Wed Jun 15 16:10:30 2011 -0700
+++ b/jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Fri Jun 17 10:27:40 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,