Commits

Armin Rigo  committed f055ecc Merge

merge heads

  • Participants
  • Parent commits a8409e1, 2890c05

Comments (0)

Files changed (2)

File pypy/module/fcntl/test/test_fcntl.py

         fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
 
     def test_large_flag(self):
+        import sys
+        if sys.platform == "darwin":
+            skip("Mac OS doesn't have any large flag in fcntl.h")
         import fcntl, sys
         if sys.maxint == 2147483647:
             assert fcntl.DN_MULTISHOT == -2147483648

File pypy/rlib/_rsocket_rffi.py

 if _POSIX:
     nfds_t = cConfig.nfds_t
     pollfd = cConfig.pollfd
-    sockaddr_ll = cConfig.sockaddr_ll
+    if cConfig.sockaddr_ll is not None:
+        sockaddr_ll = cConfig.sockaddr_ll
     ifreq = cConfig.ifreq
 if WIN32:
     WSAEVENT = cConfig.WSAEVENT