diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-11 12:06:53 +0100 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-01-11 12:06:53 +0100 |
commit | 747cde06887cc6893f650f52abcf1c9a08627d52 (patch) | |
tree | 3dae38ab12b80bc439f770a7892c613d56fb4f1d | |
parent | 77c32c24b781eafd518e2cbe9de46b348a26a201 (diff) | |
download | ouroboros-747cde06887cc6893f650f52abcf1c9a08627d52.tar.gz ouroboros-747cde06887cc6893f650f52abcf1c9a08627d52.zip |
lib: Fix Python wrapping
Since Python 3.6, the headers are no longer C89 compliant, since they
introduced C++ style comments. This sets the compiler flag to std99
instead of std89 to allow wrapping of headers. It also adds a missing
header to the wrapping file.
-rw-r--r-- | include/ouroboros/wrap/CMakeLists.txt | 3 | ||||
-rw-r--r-- | include/ouroboros/wrap/ouroboros.i | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt index 16c86611..7753ca02 100644 --- a/include/ouroboros/wrap/CMakeLists.txt +++ b/include/ouroboros/wrap/CMakeLists.txt @@ -16,6 +16,9 @@ else () else () include_directories(${PYTHON_INCLUDE_PATH}) + # Python assumes C99 since Python 3.6 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") + swig_add_module(ouroboros python ouroboros.i) swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros) diff --git a/include/ouroboros/wrap/ouroboros.i b/include/ouroboros/wrap/ouroboros.i index 23d05f7b..b156eb36 100644 --- a/include/ouroboros/wrap/ouroboros.i +++ b/include/ouroboros/wrap/ouroboros.i @@ -22,6 +22,7 @@ %module ouroboros %{ +#include "ouroboros/cacep.h" #include "ouroboros/cdap.h" #include "ouroboros/dev.h" #include "ouroboros/errno.h" @@ -35,6 +36,7 @@ typedef int pid_t; +#include "ouroboros/cacep.h" %include "ouroboros/cdap.h" %include "ouroboros/dev.h" %include "ouroboros/errno.h" |