[pypy-commit] pypy default: Merged in timfel/pypy (pull request #104: mark c_malloc and c_free as macros for recent versions of cygwin)

[arigo]

Author: arigo <armin.rigo at gmail.com>
Branch: 
Changeset: r59616:dd2141d6862c
Date: 2012-12-29 09:37 +0100
http://bitbucket.org/pypy/pypy/changeset/dd2141d6862c/

Log:	Merged in timfel/pypy (pull request #104: mark c_malloc and c_free
	as macros for recent versions of cygwin)

diff --git a/pypy/rlib/rmmap.py b/pypy/rlib/rmmap.py
--- a/pypy/rlib/rmmap.py
+++ b/pypy/rlib/rmmap.py
@@ -119,8 +119,9 @@
 PTR = rffi.CCHARP
 
 if _CYGWIN:
-    c_malloc, _ = external('malloc', [size_t], PTR)
-    c_free, _ = external('free', [PTR], lltype.Void)
+    # XXX: macro=True hack for newer versions of Cygwin (as of 12/2012)
+    c_malloc, _ = external('malloc', [size_t], PTR, macro=True)
+    c_free, _ = external('free', [PTR], lltype.Void, macro=True)
 
 c_memmove, _ = external('memmove', [PTR, PTR, size_t], lltype.Void)