diff options
| author |   Tobias Jahnke <tobias.jahnke@microchip.com> | 2018-08-08 12:52:32 +0200 |
|---|---|---|
| committer | Tobias Jahnke <tobias.jahnke@microchip.com> | 2018-08-08 12:52:32 +0200 |
| commit | 15213cbbad275f8128040d328c00f47167f8594e (patch) | |
| tree | 88a5326070d160d7208a08a3f3c8c123a2ea3017 | |
| parent | fa0ae0b9f0f7a772d9257575394a03da374c3156 (diff) | |
agl-service-unicens: move definition of api v2
Moves definition of AFB_BINDING_VERSION into config.cmake.
Fixes an issue that different api versions seems to be
defined for different code parts.
Change-Id: If7325afe583ad6a8aa37cbd18dda473fbcba673b
Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
| -rw-r--r-- | conf.d/project/config.cmake | 1 | ||||
| -rw-r--r-- | ucs2-afb/ucs_binding.h | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf.d/project/config.cmake b/conf.d/project/config.cmake index 58f568f..cceb079 100644 --- a/conf.d/project/config.cmake +++ b/conf.d/project/config.cmake @@ -94,6 +94,7 @@ add_compile_options() add_compile_options(-DCONTROL_CDEV_TX="/dev/inic-usb-ctx") add_compile_options(-DCONTROL_CDEV_RX="/dev/inic-usb-crx") add_compile_options(-DUCS2_CFG_PATH="/etc/default/ucs:../data:./data") +add_compile_options(-DAFB_BINDING_VERSION=2) # Compilation options definition # Use CMake generator expressions to specify only for a specific language diff --git a/ucs2-afb/ucs_binding.h b/ucs2-afb/ucs_binding.h index 9874ff4..e7b1a3c 100644 --- a/ucs2-afb/ucs_binding.h +++ b/ucs2-afb/ucs_binding.h @@ -18,17 +18,16 @@ #ifndef UCS2BINDING_H #define UCS2BINDING_H -// Use Version of AGL Application Framework API -#define AFB_BINDING_VERSION 2 - #ifndef PUBLIC #define PUBLIC #endif #define STATIC static -#include <json-c/json.h> +/* binding is using the application framework API V2 + * the compile option "AFB_BINDING_VERSION=2" is located + * in conf.d/project/config.cmake */ #include <afb/afb-binding.h> - +#include <json-c/json.h> #include "ucs_interface.h" #ifndef CONTROL_CDEV_TX |