diff options
| author |   Clément Bénier <clement.benier@iot.bzh> | 2018-08-28 14:29:55 +0200 |
|---|---|---|
| committer |   Romain Forlot <romain.forlot@iot.bzh> | 2018-12-17 15:03:22 +0100 |
| commit | 9cdebd57cf048c1c9ba89943f6ec2f9012bad6fc (patch) | |
| tree | 5eb532c616b17bc9157a0fdc853b69ead765e62f /filescan-utils.h | |
| parent | 264b7abf8da063a1942da8db248c2529e6ab3ffc (diff) | |
Static lib: pass afb-helpers to a static libraryguppy_6.99.3guppy/6.99.36.99.3
- add afb-timer in helpers: rename ctl-timer from ctl-utilities
into afb-timer
- use the GNUinstalldirs module to set the destination directories.
Change-Id: Ic88105d140edabcc96b091fb23f215db11ccb8c6
Signed-off-by: Clément Bénier <clement.benier@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'filescan-utils.h')
| -rw-r--r-- | filescan-utils.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/filescan-utils.h b/filescan-utils.h index 64ecfb9..a74dcb3 100644 --- a/filescan-utils.h +++ b/filescan-utils.h @@ -86,10 +86,21 @@ extern json_object* ScanForConfig (const char* searchPath, CtlScanDirModeT mode, * * @return char* string representing the path to binding root directory. */ -#if(AFB_BINDING_VERSION == 0 && defined(AFB_BINDING_WANT_DYNAPI)) -extern char *GetBindingDirPath(struct afb_dynapi *dynapi); +extern char *GetBindingDirPath_(int fd); +#if(AFB_BINDING_VERSION == 2) +static inline char *GetBindingDirPath_v2() +{ + return GetBindingDirPath_(afb_daemon_rootdir_get_fd_v2()); +} +__attribute__((alias("GetBindingDirPath_v2"))) +static char *GetBindingDirPath(); #else -extern char *GetBindingDirPath(); +static char *GetBindingDirPath_v3(struct afb_api_x3* apiHandle) +{ + return GetBindingDirPath_(afb_api_x3_rootdir_get_fd(apiHandle)); +} +__attribute__((alias("GetBindingDirPath_v3"))) +static char *GetBindingDirPath(struct afb_api_x3* apiHandle); #endif /** |