Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r60535:d701c9bcb992
Date: 2013-01-27 20:54 +0200
http://bitbucket.org/pypy/pypy/changeset/d701c9bcb992/
Log: merge
diff --git a/rpython/rlib/_rsocket_rffi.py b/rpython/rlib/_rsocket_rffi.py
--- a/rpython/rlib/_rsocket_rffi.py
+++ b/rpython/rlib/_rsocket_rffi.py
@@ -344,7 +344,7 @@
])
CConfig.WSAPROTOCOL_INFO = platform.Struct(
- 'struct WSAPROTOCOL_INFO',
+ 'WSAPROTOCOL_INFO',
[]) # Struct is just passed between functions
CConfig.FROM_PROTOCOL_INFO = platform.DefinedConstantInteger(
'FROM_PROTOCOL_INFO')
@@ -617,7 +617,7 @@
WSASocket = external('WSASocket',
[rffi.INT, rffi.INT, rffi.INT,
lltype.Ptr(WSAPROTOCOL_INFO),
- rffi.DWORD, rffi.DWORD],
+ rwin32.DWORD, rwin32.DWORD],
socketfd_type)
if WIN32:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
