[pypy-svn] r75473 - in pypy/trunk/pypy/rpython: . module

[arigo at codespeak.net]

Author: arigo
Date: Sat Jun 19 17:28:31 2010
New Revision: 75473

Modified:
   pypy/trunk/pypy/rpython/extfunc.py
   pypy/trunk/pypy/rpython/module/ll_time.py
Log:
Fixes.


Modified: pypy/trunk/pypy/rpython/extfunc.py
==============================================================================
--- pypy/trunk/pypy/rpython/extfunc.py	(original)
+++ pypy/trunk/pypy/rpython/extfunc.py	Sat Jun 19 17:28:31 2010
@@ -94,6 +94,7 @@
 
 class BaseLazyRegistering(object):
     __metaclass__ = LazyRegisteringMeta
+    compilation_info = None
 
     def configure(self, CConfig):
         classes_seen = self.__dict__.setdefault('__classes_seen', {})
@@ -101,7 +102,11 @@
             return
         from pypy.rpython.tool import rffi_platform as platform
         # copy some stuff
-        self.compilation_info = CConfig._compilation_info_
+        if self.compilation_info is None:
+            self.compilation_info = CConfig._compilation_info_
+        else:
+            self.compilation_info = self.compilation_info.merge(
+                CConfig._compilation_info_)
         self.__dict__.update(platform.configure(CConfig))
         classes_seen[CConfig] = True
 

Modified: pypy/trunk/pypy/rpython/module/ll_time.py
==============================================================================
--- pypy/trunk/pypy/rpython/module/ll_time.py	(original)
+++ pypy/trunk/pypy/rpython/module/ll_time.py	Sat Jun 19 17:28:31 2010
@@ -24,7 +24,7 @@
     STRUCT_TIMEB = 'struct timeb'
     includes = [TIME_H, 'time.h', 'errno.h', 'sys/select.h',
                 'sys/types.h', 'unistd.h', 'sys/timeb.h',
-                'sys/resource.h']
+                'sys/time.h', 'sys/resource.h']
     need_rusage = True