From 7275efd56abe3bc02b6f630dc18b415916e7f030 Mon Sep 17 00:00:00 2001
From: Thierry Bultel <thierry.bultel@iot.bzh>
Date: Tue, 3 Jul 2018 18:59:11 +0200
Subject: No longer sets the API version in code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is done in config.cmake

Change-Id: Icf36d61a5127689e55e11125cbe60b72b939bb1a
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 ahl-binding/afb-binding-common.h | 2 --
 ahl-binding/ahl-binding.cpp      | 2 +-
 conf.d/cmake/config.cmake        | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

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.")
-- 
cgit 1.2.3-korg