Changeset d8faaf2 for python

Timestamp:

Sep 23, 2016, 7:54:04 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

b6230d8

Parents:

bd8a92d

Message:

python/ext/aubiomodule.c: remove extern

Location:

python

Files:

• ext/aubio-types.h (modified) (2 diffs)
• ext/aubiomodule.c (modified) (1 diff)
• lib/gen_external.py (modified) (1 diff)

python/ext/aubio-types.h

@@ -52 +52 @@
 #endif
 
-extern PyTypeObject Py_cvecType;
+PyTypeObject Py_cvecType;
 
 PyObject * new_py_fvec(uint_t length);
@@ -59 +59 @@
 
 // defined in aubio-proxy.c
-extern int PyAubio_IsValidVector (PyObject *input);
+int PyAubio_IsValidVector (PyObject *input);
 
-extern PyObject *PyAubio_CFvecToArray (fvec_t * self);
-extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out);
+PyObject *PyAubio_CFvecToArray (fvec_t * self);
+int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out);
 
-extern int PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i);
+int PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i);
 
-extern PyObject *PyAubio_CFmatToArray (fmat_t * self);
-extern int PyAubio_ArrayToCFmat (PyObject *input, fmat_t *out);
+PyObject *PyAubio_CFmatToArray (fmat_t * self);
+int PyAubio_ArrayToCFmat (PyObject *input, fmat_t *out);
 
 // hand written wrappers
-extern PyTypeObject Py_filterType;
+PyTypeObject Py_filterType;
 
-extern PyTypeObject Py_filterbankType;
+PyTypeObject Py_filterbankType;
 
-extern PyTypeObject Py_fftType;
+PyTypeObject Py_fftType;
 
-extern PyTypeObject Py_pvocType;
+PyTypeObject Py_pvocType;
 
-extern PyTypeObject Py_sourceType;
+PyTypeObject Py_sourceType;
 
-extern PyTypeObject Py_sinkType;
+PyTypeObject Py_sinkType;

python/ext/aubiomodule.c

@@ -75 +75 @@
 ">>> min_removal(a)";
 
-extern void add_generated_objects ( PyObject *m );
-extern void add_ufuncs ( PyObject *m );
-extern int generated_types_ready(void);
+void add_ufuncs ( PyObject *m );
+int generated_types_ready(void);
 
 static PyObject *

python/lib/gen_external.py

@@ -225 +225 @@
         sources_list.append(output_file)
 
-    objlist = "".join(["extern PyTypeObject Py_%sType;\n" % p for p in lib])
+    objlist = "".join(["PyTypeObject Py_%sType;\n" % p for p in lib])
     out = """// generated list of objects created with gen_external.py