[pypy-svn] r77151 - pypy/trunk/pypy/rlib

fijal at codespeak.net fijal at codespeak.net
Fri Sep 17 15:47:28 CEST 2010


Author: fijal
Date: Fri Sep 17 15:47:26 2010
New Revision: 77151

Modified:
   pypy/trunk/pypy/rlib/_rsocket_rffi.py
Log:
Merge 77127 from rsocket-improvements branch


Modified: pypy/trunk/pypy/rlib/_rsocket_rffi.py
==============================================================================
--- pypy/trunk/pypy/rlib/_rsocket_rffi.py	(original)
+++ pypy/trunk/pypy/rlib/_rsocket_rffi.py	Fri Sep 17 15:47:26 2010
@@ -32,11 +32,13 @@
                 'arpa/inet.h',
                 'stdint.h', 
                 'errno.h',
-                'netpacket/packet.h',
-                'sys/ioctl.h',
-                'net/if.h',
                 )
-    cond_includes = [('AF_NETLINK', 'linux/netlink.h')]
+
+    cond_includes = [('AF_NETLINK', 'linux/netlink.h'),
+                     ('AF_PACKET', 'netpacket/packet.h'),
+                     ('AF_PACKET', 'sys/ioctl.h'),
+                     ('AF_PACKET', 'net/if.h')]
+    
     libraries = ()
     calling_conv = 'c'
     HEADER = ''.join(['#include <%s>\n' % filename for filename in includes])



More information about the Pypy-commit mailing list