[Numpy-svn] r8482 - trunk/numpy/core/include/numpy

[numpy-svn at scipy.org]

Author: ptvirtan
Date: 2010-07-17 08:11:05 -0500 (Sat, 17 Jul 2010)
New Revision: 8482

Modified:
   trunk/numpy/core/include/numpy/npy_3kcompat.h
Log:
BUG: core: fix C++ issues in npy_3kcompat.h

Modified: trunk/numpy/core/include/numpy/npy_3kcompat.h
===================================================================
--- trunk/numpy/core/include/numpy/npy_3kcompat.h	2010-07-17 13:10:39 UTC (rev 8481)
+++ trunk/numpy/core/include/numpy/npy_3kcompat.h	2010-07-17 13:11:05 UTC (rev 8482)
@@ -20,6 +20,10 @@
 #include "numpy/npy_common.h"
 #include "numpy/ndarrayobject.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * PyInt -> PyLong
  */
@@ -115,20 +119,20 @@
 static NPY_INLINE void
 PyUnicode_ConcatAndDel(PyObject **left, PyObject *right)
 {
-    PyObject *new;
-    new = PyUnicode_Concat(*left, right);
+    PyObject *newobj;
+    newobj = PyUnicode_Concat(*left, right);
     Py_DECREF(*left);
     Py_DECREF(right);
-    *left = new;
+    *left = newobj;
 }
 
 static NPY_INLINE void
 PyUnicode_Concat2(PyObject **left, PyObject *right)
 {
-    PyObject *new;
-    new = PyUnicode_Concat(*left, right);
+    PyObject *newobj;
+    newobj = PyUnicode_Concat(*left, right);
     Py_DECREF(*left);
-    *left = new;
+    *left = newobj;
 }
 
 
@@ -312,4 +316,8 @@
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _NPY_3KCOMPAT_H_ */