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

[arigo at codespeak.net]

Author: arigo
Date: Wed Sep  8 10:47:40 2010
New Revision: 76935

Modified:
   pypy/trunk/pypy/rlib/_rsocket_rffi.py
Log:
Revert r76928.  It breaks tons of tests and there is no reason for
this checkin alone.


Modified: pypy/trunk/pypy/rlib/_rsocket_rffi.py
==============================================================================
--- pypy/trunk/pypy/rlib/_rsocket_rffi.py	(original)
+++ pypy/trunk/pypy/rlib/_rsocket_rffi.py	Wed Sep  8 10:47:40 2010
@@ -32,7 +32,6 @@
                 'arpa/inet.h',
                 'stdint.h', 
                 'errno.h',
-                'netpacket/packet.h'
                 )
     cond_includes = [('AF_NETLINK', 'linux/netlink.h')]
     libraries = ()
@@ -274,7 +273,7 @@
                                               ('nl_pid', rffi.INT),
                                               ('nl_groups', rffi.INT)],
                                              ifdef='AF_NETLINK')
-
+                                             
 CConfig.addrinfo = platform.Struct('struct addrinfo',
                                      [('ai_flags', rffi.INT),
                                       ('ai_family', rffi.INT),
@@ -310,15 +309,6 @@
                                             [('fd', socketfd_type),
                                              ('events', rffi.SHORT),
                                              ('revents', rffi.SHORT)])
-
-    CConfig.sockaddr_ll = platform.Struct('struct sockaddr_ll',
-                                          [('sll_protocol', rffi.INT),
-                                           ('sll_pkttype', rffi.INT),
-                                           ('sll_hatype', rffi.INT),
-                                           ('sll_addr', CCHARP),
-                                           ('sll_halen', rffi.INT)],
-                                          )
-
 if _WIN32:
     CConfig.WSAEVENT = platform.SimpleType('WSAEVENT', rffi.VOIDP)
     CConfig.WSANETWORKEVENTS = platform.Struct(