[pypy-svn] r66058 - pypy/branch/pyjitpl5/pypy/rlib

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:38:32 2009
New Revision: 66058

Added:
   pypy/branch/pyjitpl5/pypy/rlib/libffi.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/rlib/libffi.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/rlib/libffi.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65735 | fijal | 2009-06-10 23:07:01 +0200 (Wed, 10 Jun 2009) | 4 lines
    
    Report error early (at the import time) if C library cannot be found.
    Otherwise it explodes with pretty obscure annotation error. We can fix
    the annotation error, but we need c library anyway.
    
    ------------------------------------------------------------------------
    r64537 | afa | 2009-04-21 18:22:02 +0200 (Tue, 21 Apr 2009) | 3 lines
    
    Remove this #define that I don't know why it was here
    and causes the build to fail on Vista
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/rlib/libffi.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/rlib/libffi.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rlib/libffi.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rlib/libffi.py.merge.tmp	Tue Jun 30 16:38:32 2009
@@ -81,7 +81,6 @@
 else:
     libffidir = py.path.local(pypydir).join('translator', 'c', 'src', 'libffi_msvc')
     eci = ExternalCompilationInfo(
-        pre_include_bits = ['#define _WIN32_WINNT 0x501'],
         includes = ['ffi.h', 'windows.h'],
         libraries = ['kernel32'],
         include_dirs = [libffidir],
@@ -257,6 +256,8 @@
         pass # No check
     
     libc_name = ctypes.util.find_library('c')
+    assert libc_name is not None, "Cannot find C library, ctypes.util.find_library('c') returned None"
+
     def get_libc_name():
         return libc_name