[pypy-svn] r72409 - pypy/branch/kill-python-h/pypy/translator/c/gcc

[afa at codespeak.net]

Author: afa
Date: Fri Mar 19 13:09:04 2010
New Revision: 72409

Modified:
   pypy/branch/kill-python-h/pypy/translator/c/gcc/trackgcroot.py
Log:
When targeting windows2000, ws2tcpip.h generates a compatibility function for getaddrinfo().
trackgcroot.py needs to support the definition of inline STDCALL functions.


Modified: pypy/branch/kill-python-h/pypy/translator/c/gcc/trackgcroot.py
==============================================================================
--- pypy/branch/kill-python-h/pypy/translator/c/gcc/trackgcroot.py	(original)
+++ pypy/branch/kill-python-h/pypy/translator/c/gcc/trackgcroot.py	Fri Mar 19 13:09:04 2010
@@ -331,6 +331,11 @@
                     label = label2
         if label is None:
             k = call.lineno
+            if self.format == 'msvc':
+                # Some header files (ws2tcpip.h) define STDCALL functions
+                funcname = self.funcname.split('@')[0]
+            else:
+                funcname = self.funcname
             while 1:
                 label = '__gcmap_%s__%s_%d' % (self.filetag, self.funcname, k)
                 if label not in self.labels: