Merge jdk7-b146
authorlana
Sat, 18 Jun 2011 10:12:58 -0700
changeset 4369539e576793a8
parent 4366 a65fa0f6717e
parent 4368 c102e1221afa
child 4370 7b4f4230fecf
child 4372 cfd7602f5c52
Merge
     1.1 --- a/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Fri Jun 17 16:25:01 2011 -0700
     1.2 +++ b/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c	Sat Jun 18 10:12:58 2011 -0700
     1.3 @@ -44,7 +44,7 @@
     1.4  #define SO_UPDATE_CONNECT_CONTEXT 0x7010
     1.5  #endif
     1.6  
     1.7 -typedef BOOL (*ConnectEx_t)
     1.8 +typedef BOOL (PASCAL *ConnectEx_t)
     1.9  (
    1.10      SOCKET s,
    1.11      const struct sockaddr* name,