diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2018-07-03 18:59:11 +0200 |
|---|---|---|
| committer | Thierry Bultel <thierry.bultel@iot.bzh> | 2018-07-03 18:59:11 +0200 |
| commit | 56f9d67e5856aed4f6349769fd262217497f6bc5 (patch) | |
| tree | e8448dee97b8c362e22e9abf99020d4593349364 | |
| parent | b8b5c0850617ab11e1497acb9d929ef69916d1b5 (diff) | |
No longer sets the API version in code
This is done in config.cmake
Change-Id: Icf36d61a5127689e55e11125cbe60b72b939bb1a
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
| m--------- | afb-utilities | 0 | ||||
| -rw-r--r-- | ahl-binding/afb-binding-common.h | 2 | ||||
| -rw-r--r-- | ahl-binding/ahl-binding.cpp | 2 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 | ||||
| m--------- | controller | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/afb-utilities b/afb-utilities -Subproject 43ec9716bf83d8a6e5ff15909705cb1adc3c189 +Subproject 2c1edf4183b8b19e335f83ea0664e17a97ac991 diff --git a/ahl-binding/afb-binding-common.h b/ahl-binding/afb-binding-common.h index 61118db..71ea2ae 100644 --- a/ahl-binding/afb-binding-common.h +++ b/ahl-binding/afb-binding-common.h @@ -21,8 +21,6 @@ extern "C" { #endif -#define AFB_BINDING_VERSION 0 -#define AFB_BINDING_WANT_DYNAPI #include <afb/afb-binding.h> #include <string.h> #include <ctl-config.h> diff --git a/ahl-binding/ahl-binding.cpp b/ahl-binding/ahl-binding.cpp index 29be7a1..6247371 100644 --- a/ahl-binding/ahl-binding.cpp +++ b/ahl-binding/ahl-binding.cpp @@ -35,7 +35,7 @@ int ahl_api_create(void*, struct afb_dynapi* handle) * @param[in] handle Handle to start with for API creation. * @return Status code, zero if success. */ -int afbBindingVdyn(afb_dynapi* handle) +int afbBindingEntry(afb_dynapi* handle) { using namespace std::placeholders; assert(handle != nullptr); diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 02671cc..00b8141 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -99,6 +99,8 @@ set(COMPILE_OPTIONS -DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lib:${CMAKE_BINARY_DIR}/package/lib/plugins:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/lib/plugins" -DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lua:${CMAKE_BINARY_DIR}/package/data:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/var" -DUSE_API_DYN=1 +-DAFB_BINDING_VERSION=3 +-DAFB_BINDING_WANT_DYNAPI=1 CACHE STRING "Compilation flags") #set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.") #set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.") diff --git a/controller b/controller -Subproject 738ae54a57f1df7191e075e9eb467d1fc76e4ad +Subproject b0da464b2560d2abcc286503517e6b5e915c96f |