Author: andrewjlawrence
Branch:
Changeset: r95886:d8e2362354de
Date: 2019-02-08 09:39 +0000
http://bitbucket.org/pypy/pypy/changeset/d8e2362354de/
Log: Merged inet_pton change
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
@@ -1191,14 +1191,14 @@
inet_ntoa = external('inet_ntoa', [in_addr], rffi.CCHARP)
-if _POSIX:
- inet_pton = external('inet_pton', [rffi.INT, rffi.CCHARP,
- rffi.VOIDP], rffi.INT,
- save_err=SAVE_ERR)
- inet_ntop = external('inet_ntop', [rffi.INT, rffi.VOIDP, CCHARP,
- socklen_t], CCHARP,
- save_err=SAVE_ERR)
+inet_pton = external('inet_pton', [rffi.INT, rffi.CCHARP,
+ rffi.VOIDP], rffi.INT,
+ save_err=SAVE_ERR)
+
+inet_ntop = external('inet_ntop', [rffi.INT, rffi.VOIDP, CCHARP,
+ socklen_t], CCHARP,
+ save_err=SAVE_ERR)
inet_addr = external('inet_addr', [rffi.CCHARP], rffi.UINT)
socklen_t_ptr = lltype.Ptr(rffi.CFixedArray(socklen_t, 1))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
