Merge pull request #365 from bfroehle/static_f2py_size

njsmith · njsmith · commit c8ed8baac192 · 2012-09-21T06:51:26.000-07:00
BUG: Exported f2py_size symbol prevents linking multiple f2py modules.
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
@@ -260,7 +260,7 @@
 """
 needs['f2py_size']=['stdarg.h']
 cfuncs['f2py_size']="""\
-int f2py_size(PyArrayObject* var, ...)
+static int f2py_size(PyArrayObject* var, ...)
 {
   npy_int sz = 0;
   npy_int dim;

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@`
`260`	`260`	`"""`
`261`	`261`	`needs['f2py_size']=['stdarg.h']`
`262`	`262`	`cfuncs['f2py_size']="""\`
`263`		`-int f2py_size(PyArrayObject* var, ...)`
	`263`	`+static int f2py_size(PyArrayObject* var, ...)`
`264`	`264`	`{`
`265`	`265`	`npy_int sz = 0;`
`266`	`266`	`npy_int dim;`