[pypy-svn] r49096 - in pypy/dist/pypy/module: _curses crypt readline

[fijal at codespeak.net]

Author: fijal
Date: Sun Nov 25 18:42:04 2007
New Revision: 49096

Modified:
   pypy/dist/pypy/module/_curses/fficurses.py
   pypy/dist/pypy/module/crypt/interp_crypt.py
   pypy/dist/pypy/module/readline/c_readline.py
Log:
Fix few modules


Modified: pypy/dist/pypy/module/_curses/fficurses.py
==============================================================================
--- pypy/dist/pypy/module/_curses/fficurses.py	(original)
+++ pypy/dist/pypy/module/_curses/fficurses.py	Sun Nov 25 18:42:04 2007
@@ -9,20 +9,24 @@
 from pypy.rpython.extregistry import ExtRegistryEntry
 from pypy.module._curses import interp_curses
 from pypy.rpython.lltypesystem import llmemory
+from pypy.translator.tool.cbuild import ExternalCompilationInfo
+
+eci = ExternalCompilationInfo(
+    includes = ['curses.h', 'term.h'],
+    libraries = ['curses'],
+)
+
 
-# waaa...
-includes = ['curses.h', 'term.h']
-libs = ['curses']
 
 INT = rffi.INT
 INTP = lltype.Ptr(lltype.Array(INT, hints={'nolength':True}))
 c_setupterm = rffi.llexternal('setupterm', [rffi.CCHARP, INT, INTP], INT,
-                              includes=includes, libraries=libs)
+                              compilation_info=eci)
 c_tigetstr = rffi.llexternal('tigetstr', [rffi.CCHARP], rffi.CCHARP,
-                             includes=includes, libraries=libs)
+                             compilation_info=eci)
 c_tparm = rffi.llexternal('tparm', [rffi.CCHARP, INT, INT, INT, INT, INT,
                                     INT, INT, INT, INT, INT], rffi.CCHARP,
-                          includes=includes, libraries=libs)
+                          compilation_info=eci)
 
 ERR = rffi.CConstant('ERR', INT)
 OK = rffi.CConstant('OK', INT)

Modified: pypy/dist/pypy/module/crypt/interp_crypt.py
==============================================================================
--- pypy/dist/pypy/module/crypt/interp_crypt.py	(original)
+++ pypy/dist/pypy/module/crypt/interp_crypt.py	Sun Nov 25 18:42:04 2007
@@ -1,10 +1,11 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root
 from pypy.rpython.lltypesystem import rffi, lltype
+from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
-
+eci = ExternalCompilationInfo(libraries=['crypt'])
 c_crypt = rffi.llexternal('crypt', [rffi.CCHARP, rffi.CCHARP], rffi.CCHARP,
-                          libraries=["crypt"], threadsafe=False)
+                          compilation_info=eci, threadsafe=False)
 
 def crypt(space, word, salt):
     """word will usually be a user's password. salt is a 2-character string

Modified: pypy/dist/pypy/module/readline/c_readline.py
==============================================================================
--- pypy/dist/pypy/module/readline/c_readline.py	(original)
+++ pypy/dist/pypy/module/readline/c_readline.py	Sun Nov 25 18:42:04 2007
@@ -2,13 +2,15 @@
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import ObjSpace, interp2app
+from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
-includes = ["readline/readline.h", "readline/history.h"]
-libs = ['readline']
+eci = ExternalCompilationInfo(
+    includes = ["readline/readline.h", "readline/history.h"],
+    libraries = ['readline']
+)
 
 def external(name, args, result):
-    return rffi.llexternal(name, args, result, includes=includes,
-                           libraries=libs)
+    return rffi.llexternal(name, args, result, compilation_info=eci)
 
 # get a binding to  c library functions and define their args and return types
 # char *readline(char *)