[pypy-svn] r46290 - pypy/branch/pypy-more-rtti-inprogress/rpython/module

[arigo at codespeak.net]

Author: arigo
Date: Mon Sep  3 18:28:37 2007
New Revision: 46290

Modified:
   pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py
Log:
Sprinkling underscores in front of C library function names
on Windows, for ctypes to find the functions.


Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os.py	Mon Sep  3 18:28:37 2007
@@ -115,7 +115,7 @@
 
     @registering(os.dup)
     def register_os_dup(self):
-        os_dup = self.llexternal('dup', [rffi.INT], rffi.INT)
+        os_dup = self.llexternal(underscore_on_windows+'dup', [rffi.INT], rffi.INT)
 
         def dup_llimpl(fd):
             newfd = rffi.cast(lltype.Signed, os_dup(rffi.cast(rffi.INT, fd)))
@@ -128,7 +128,8 @@
 
     @registering(os.dup2)
     def register_os_dup2(self):
-        os_dup2 = self.llexternal('dup2', [rffi.INT, rffi.INT], rffi.INT)
+        os_dup2 = self.llexternal(underscore_on_windows+'dup2',
+                                  [rffi.INT, rffi.INT], rffi.INT)
 
         def dup2_llimpl(fd, newfd):
             error = rffi.cast(lltype.Signed, os_dup2(rffi.cast(rffi.INT, fd),
@@ -356,7 +357,8 @@
 
     @registering(os.open)
     def register_os_open(self):
-        os_open = self.llexternal('open', [rffi.CCHARP, rffi.INT, rffi.MODE_T],
+        os_open = self.llexternal(underscore_on_windows+'open',
+                                  [rffi.CCHARP, rffi.INT, rffi.MODE_T],
                                   rffi.INT)
 
         def os_open_llimpl(path, flags, mode):
@@ -375,7 +377,8 @@
 
     @registering(os.read)
     def register_os_read(self):
-        os_read = self.llexternal('read', [rffi.INT, rffi.VOIDP, rffi.SIZE_T],
+        os_read = self.llexternal(underscore_on_windows+'read',
+                                  [rffi.INT, rffi.VOIDP, rffi.SIZE_T],
                                   rffi.SIZE_T)
 
         def os_read_llimpl(fd, count):
@@ -401,8 +404,9 @@
 
     @registering(os.write)
     def register_os_write(self):
-        os_write = self.llexternal('write', [rffi.INT, rffi.VOIDP,
-                                   rffi.SIZE_T], rffi.SIZE_T)
+        os_write = self.llexternal(underscore_on_windows+'write',
+                                   [rffi.INT, rffi.VOIDP, rffi.SIZE_T],
+                                   rffi.SIZE_T)
 
         def os_write_llimpl(fd, data):
             count = len(data)
@@ -428,7 +432,7 @@
 
     @registering(os.close)
     def register_os_close(self):
-        os_close = self.llexternal('close', [rffi.INT], rffi.INT)
+        os_close = self.llexternal(underscore_on_windows+'close', [rffi.INT], rffi.INT)
         
         def close_llimpl(fd):
             error = rffi.cast(lltype.Signed, os_close(rffi.cast(rffi.INT, fd)))
@@ -781,7 +785,7 @@
 
     @registering(os.isatty)
     def register_os_isatty(self):
-        os_isatty = self.llexternal('isatty', [rffi.INT], rffi.INT)
+        os_isatty = self.llexternal(underscore_on_windows+'isatty', [rffi.INT], rffi.INT)
 
         def isatty_llimpl(fd):
             res = os_isatty(rffi.cast(rffi.INT, fd))
@@ -816,7 +820,7 @@
 
     @registering(os.unlink)
     def register_os_unlink(self):
-        os_unlink = self.llexternal('unlink', [rffi.CCHARP], rffi.INT)
+        os_unlink = self.llexternal(underscore_on_windows+'unlink', [rffi.CCHARP], rffi.INT)
 
         def unlink_llimpl(pathname):
             res = os_unlink(pathname)
@@ -828,7 +832,7 @@
 
     @registering(os.chdir)
     def register_os_chdir(self):
-        os_chdir = self.llexternal('chdir', [rffi.CCHARP], rffi.INT)
+        os_chdir = self.llexternal(underscore_on_windows+'chdir', [rffi.CCHARP], rffi.INT)
 
         def chdir_llimpl(path):
             res = os_chdir(path)
@@ -844,7 +848,8 @@
             ARG2 = []         # no 'mode' argument on Windows - just ignored
         else:
             ARG2 = [rffi.MODE_T]
-        os_mkdir = self.llexternal('mkdir', [rffi.CCHARP]+ARG2, rffi.INT)
+        os_mkdir = self.llexternal(underscore_on_windows+'mkdir',
+                                   [rffi.CCHARP]+ARG2, rffi.INT)
         IGNORE_MODE = len(ARG2) == 0
 
         def mkdir_llimpl(pathname, mode):
@@ -860,7 +865,7 @@
 
     @registering(os.rmdir)
     def register_os_rmdir(self):
-        os_rmdir = self.llexternal('rmdir', [rffi.CCHARP], rffi.INT)
+        os_rmdir = self.llexternal(underscore_on_windows+'rmdir', [rffi.CCHARP], rffi.INT)
 
         def rmdir_llimpl(pathname):
             res = os_rmdir(pathname)
@@ -872,7 +877,7 @@
 
     @registering(os.chmod)
     def register_os_chmod(self):
-        os_chmod = self.llexternal('chmod', [rffi.CCHARP, rffi.MODE_T],
+        os_chmod = self.llexternal(underscore_on_windows+'chmod', [rffi.CCHARP, rffi.MODE_T],
                                    rffi.INT)
 
         def chmod_llimpl(path, mode):
@@ -898,7 +903,7 @@
 
     @registering(os.umask)
     def register_os_umask(self):
-        os_umask = self.llexternal('umask', [rffi.MODE_T], rffi.MODE_T)
+        os_umask = self.llexternal(underscore_on_windows+'umask', [rffi.MODE_T], rffi.MODE_T)
 
         def umask_llimpl(fd):
             res = os_umask(rffi.cast(rffi.MODE_T, fd))