]> sigrok.org Git - libsigrok.git/commit
python: Fix the build for Python >= 3.
authorUwe Hermann <redacted>
Mon, 31 Aug 2015 19:08:08 +0000 (21:08 +0200)
committerUwe Hermann <redacted>
Mon, 31 Aug 2015 19:08:08 +0000 (21:08 +0200)
commita2e4d88205d08729d7a2f43dbd818ac68fdcf693
tree18040b78d25a9d33c2a3affbc81345432d76a782
parentb05409d7923df5205c07e5cce2d2791eb74cf268
python: Fix the build for Python >= 3.

SWIG_init() returns void for Python 2.x and 'PyObject *' for Python 3.

Use an #if to handle both cases properly, otherwise the Python bindings
for either Python 2 or 3 will fail to build.

Python 3.x failure:

sigrok/core/classes_wrap.cpp: In function ‘PyObject* PyInit__classes()’:
sigrok/core/classes_wrap.cpp:59002:5: error: return-statement with no
value, in function returning ‘PyObject* {aka _object*}’ [-fpermissive]
     return;
     ^

Python 2.x failure:

In file included from /usr/include/dirent.h:244:0,
                 from /usr/include/glib-2.0/glib/gdir.h:32,
                 from /usr/include/glib-2.0/glib.h:45,
                 from /usr/include/pygobject-3.0/pygobject.h:7,
                 from sigrok/core/classes_wrap.cpp:3179:
sigrok/core/classes_wrap.cpp: In function ‘void init_classes()’:
sigrok/core/classes_wrap.cpp:59002:12: error: return-statement with a
value, in function returning 'void' [-fpermissive]
     return NULL;
            ^
bindings/python/sigrok/core/classes.i