# HG changeset patch
# User lana
# Date 1308417178 25200
# Node ID 539e576793a8e64aaf160e0d6ab0b9723cd0bef0
# Parent  a65fa0f6717e6a2f9e7503eba5ed053bedb8063a# Parent  c102e1221afa87a6cf9478e14cfc9091839b9ed3
Merge

diff -r a65fa0f6717e -r 539e576793a8 src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c
--- a/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Fri Jun 17 16:25:01 2011 -0700
+++ b/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,