# HG changeset patch
# User lana
# Date 1308331660 25200
# Node ID ee7353e276a132aa49c65e1ef38b061de25c9cfd
# Parent  0bf9c4c0619f57b967d0fc838449789db5beb201# Parent  d45e2e8fbefa4408fe45c71f835603392465d3b5
Merge

diff -r 0bf9c4c0619f -r ee7353e276a1 jdk/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c
--- 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,