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

[arigo at codespeak.net]

Author: arigo
Date: Mon Sep  3 18:26:46 2007
New Revision: 46288

Modified:
   pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py
Log:
Attempted fix for OS/X


Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/module/ll_os_environ.py	Mon Sep  3 18:26:46 2007
@@ -104,11 +104,15 @@
 
 if hasattr(__import__(os.name), 'unsetenv'):
 
-    os_unsetenv = rffi.llexternal('unsetenv', [rffi.CCHARP], rffi.INT)
+    if sys.platform.startswith('darwin'):
+        RETTYPE = lltype.Void
+    else:
+        RETTYPE = rffi.INT
+    os_unsetenv = rffi.llexternal('unsetenv', [rffi.CCHARP], RETTYPE)
 
     def unsetenv_llimpl(name):
         l_name = rffi.str2charp(name)
-        error = os_unsetenv(l_name)
+        error = os_unsetenv(l_name)     # 'error' is None on OS/X
         rffi.free_charp(l_name)
         if error:
             raise OSError(rffi.get_errno(), "os_unsetenv failed")