diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-10-14 11:32:22 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-10-14 11:32:22 +0000 |
| commit | bf1602c915dee8bd6cbb69aba1fe88619b9c0eed (patch) | |
| tree | 8c93fcb67d61ca40b060f9c9ea1b62389f247dbd /include | |
| parent | 1888c137a8ff315bc549c16740aa727da8c666f5 (diff) | |
| parent | bedd1d4eadde9ab64f924c69eba716b015599e67 (diff) | |
| download | ouroboros-bf1602c915dee8bd6cbb69aba1fe88619b9c0eed.tar.gz ouroboros-bf1602c915dee8bd6cbb69aba1fe88619b9c0eed.zip | |
Merged in dstaesse/ouroboros/be-deprecate-ouroboros-init-fini (pull request #626)
Be deprecate ouroboros init fini
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/dev.h | 5 | ||||
| -rw-r--r-- | include/ouroboros/wrap/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/ouroboros/wrap/ouroboros.i | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h index 0441179d..f64221d8 100644 --- a/include/ouroboros/dev.h +++ b/include/ouroboros/dev.h @@ -31,11 +31,6 @@ __BEGIN_DECLS -/* These calls should be removed once we write the ouroboros OS. */ -int ouroboros_init(const char * ap_name); - -void ouroboros_fini(void); - /* Returns flow descriptor, qs updates to supplied QoS. */ int flow_alloc(const char * dst_name, qosspec_t * qs, diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt index 4ec42b9a..4ffc54a8 100644 --- a/include/ouroboros/wrap/CMakeLists.txt +++ b/include/ouroboros/wrap/CMakeLists.txt @@ -32,7 +32,8 @@ else () TYPE MODULE) endif() - swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros) + swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros-common + ouroboros-dev ouroboros-irm) # Installation directives if (CMAKE_INSTALL_PREFIX STREQUAL "") diff --git a/include/ouroboros/wrap/ouroboros.i b/include/ouroboros/wrap/ouroboros.i index db5e09f2..42d78c1c 100644 --- a/include/ouroboros/wrap/ouroboros.i +++ b/include/ouroboros/wrap/ouroboros.i @@ -3,7 +3,8 @@ * * SWIG wrapper file * - * Sander Vrijders <sander.vrijders@intec.ugent.be> + * Dimitri Staessens <dimitri.staessens@ugent.be> + * Sander Vrijders <sander.vrijders@ugent.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License |