Author: Carl Friedrich Bolz-Tereick <[email protected]>
Branch: py3.6
Changeset: r96798:60c42a75264d
Date: 2019-06-12 13:49 +0200
http://bitbucket.org/pypy/pypy/changeset/60c42a75264d/
Log: merge default
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
@@ -1011,7 +1011,7 @@
CConfig.WSAPROTOCOL_INFO = platform.Struct(
'WSAPROTOCOL_INFOA',
[]) # Struct is just passed between functions
-
+
CConfig.FROM_PROTOCOL_INFO = platform.DefinedConstantInteger(
'FROM_PROTOCOL_INFO')
@@ -1038,21 +1038,21 @@
('keepaliveinterval', rffi.ULONG)])
CConfig.GUID = platform.Struct(
- 'struct _GUID',
- [('Data1', rffi.UINT),
+ 'struct _GUID',
+ [('Data1', rffi.UINT),
('Data2', rffi.UINT),
('Data3', rffi.UINT),
('Data4', rffi.CFixedArray(rffi.UCHAR, 8))
])
-
+
CConfig.WSAPROTOCOLCHAIN = platform.Struct(
'struct _WSAPROTOCOLCHAIN',
[('ChainLen', rffi.INT),
('ChainEntries', rffi.CFixedArray(rffi.UINT, 7))])
-
+
WSAPROTOCOLCHAIN = CConfig.WSAPROTOCOLCHAIN
- GUID = CConfig.GUID
-
+ GUID = CConfig.GUID
+
CConfig.WSAPROTOCOL_INFOW = platform.Struct(
'struct _WSAPROTOCOL_INFOW',
[('dwServiceFlags1', rffi.UINT),
@@ -1391,7 +1391,7 @@
lltype.Ptr(WSAPROTOCOL_INFOW),
rwin32.DWORD, rwin32.DWORD],
socketfd_type, save_err=SAVE_ERR)
-
+
tcp_keepalive = cConfig.tcp_keepalive
WSAPROTOCOL_INFO = cConfig.WSAPROTOCOL_INFO
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
