merge

.hgtags

@@ -14,3 +14,4 @@ a4abf0156540db4d3ebaa95712b65811c43c5acb 0.11-beta
 7bc36a0f81723117a19f92ffde1676a0884fef65 0.11.1.beta
 6454db601984145f38e28d34176fca8a3a22329c 0.11.1
 af6f1bed8cd40a2edefb57d3eacbc9274a8788b4 0.11.2.rc1
+15ad532e2127840ae09dfbe46ccc80ac8c562f99 0.11.2

Cython/Compiler/Code.py

@@ -330,7 +330,8 @@ class GlobalState(object):
         'global_var',
         'decls',
         'all_the_rest',
-        'utility_code_def'
+        'utility_code_def',
+        'end'
     ]
     
 

Cython/Compiler/ModuleNode.py

@@ -416,7 +416,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             code.putln('#include "%s"' % filename)
         code.putln("#ifndef Py_PYTHON_H")
         code.putln("    #error Python headers needed to compile C extensions, please install development version of Python.")
-        code.putln("#endif")
+        code.putln("#else")
+        code.globalstate["end"].putln("#endif /* Py_PYTHON_H */")
         code.putln("#ifndef PY_LONG_LONG")
         code.putln("  #define PY_LONG_LONG LONG_LONG")
         code.putln("#endif")

Cython/Compiler/PyrexTypes.py

@@ -831,8 +831,10 @@ proto="""
 #if __PYX_USE_C99_COMPLEX
 
     typedef %(real_type)s _Complex %(type_name)s;
-    #define %(type_name)s_from_parts(x, y) ((x) + (y)*(%(type)s)_Complex_I)
-
+    static INLINE %(type)s %(type_name)s_from_parts(%(real_type)s x, %(real_type)s y) {
+      return x + y*(%(type)s)_Complex_I;
+    }
+    
     #define %(type_name)s_is_zero(a) ((a) == 0)
     #define %(type_name)s_eq(a, b) ((a) == (b))
     #define %(type_name)s_add(a, b) ((a)+(b))
@@ -844,8 +846,10 @@ proto="""
 #else
 
     typedef struct { %(real_type)s real, imag; } %(type_name)s;
-    #define %(type_name)s_from_parts(x, y) ((%(type_name)s){(%(real_type)s)x, (%(real_type)s)y})
-
+    static INLINE %(type)s %(type_name)s_from_parts(%(real_type)s x, %(real_type)s y) {
+      %(type)s c; c.real = x; c.imag = y; return c;
+    }
+    
     static INLINE int %(type_name)s_is_zero(%(type)s a) {
        return (a.real == 0) & (a.imag == 0);
     }

Cython/Compiler/Version.py

-version = '0.11.2.rc1'
+version = '0.11.2'