From: Lisandro Dalcin <dalcinl@gmail.com>
Date: Fri, 18 Dec 2009 00:46:03 +0000 (-0300)
Subject: protect definition of INLINE and fix for MSVC (thanks to Julien Danjou)
X-Git-Tag: 0.12.1~36
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ae3f3f4e77b6e194439bcc448fb5c856f6eddb3b;p=cython.git

protect definition of INLINE and fix for MSVC (thanks to Julien Danjou)
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index e6b00487..6c22ffa9 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -4820,12 +4820,14 @@ class FromImportStatNode(StatNode):
 
 utility_function_predeclarations = \
 """
-#ifdef __GNUC__
-#define INLINE __inline__
-#elif _WIN32
-#define INLINE __inline
-#else
-#define INLINE 
+#ifndef INLINE
+  #if defined(__GNUC__)
+    #define INLINE __inline__
+  #elif defined(_MSC_VER)
+    #define INLINE __inline
+  #else
+    #define INLINE 
+  #endif
 #endif
 
 typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/