This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/export_headers in repository https://gitbox.apache.org/repos/asf/celix.git
commit ad63f68ce77f4ca5f75522b3b41d34c1afcc668f Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Apr 16 10:40:13 2023 +0200 Fix wrong usage of EXPORT marco on structs --- libs/dfi/include/dfi_log_util.h | 4 +++- libs/dfi/include/dyn_common.h | 2 +- libs/dfi/include/dyn_function.h | 2 +- libs/dfi/include/dyn_type.h | 6 +++--- libs/etcdlib/CMakeLists.txt | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/dfi/include/dfi_log_util.h b/libs/dfi/include/dfi_log_util.h index 29101903..5764d9fa 100644 --- a/libs/dfi/include/dfi_log_util.h +++ b/libs/dfi/include/dfi_log_util.h @@ -20,6 +20,8 @@ #ifndef _DFI_LOG_UTIL_H_ #define _DFI_LOG_UTIL_H_ +#include "celix_df_export.h" + #ifdef __cplusplus extern "C" { #endif @@ -34,7 +36,7 @@ typedef void (*logf_ft)(void *handle, int level, const char *file, int line, con static void *g_logHandle = NULL; \ static int g_currentLogLevel = 1; \ \ - void cmp ## _logSetup(logf_ft logf, void *handle, int currentLogLevel) { \ + CELIX_DFI_EXPORT void cmp ## _logSetup(logf_ft logf, void *handle, int currentLogLevel) { \ g_currentLogLevel = currentLogLevel; \ g_logHandle = handle; \ g_logf = logf; \ diff --git a/libs/dfi/include/dyn_common.h b/libs/dfi/include/dyn_common.h index 294048b8..ff2eae8b 100644 --- a/libs/dfi/include/dyn_common.h +++ b/libs/dfi/include/dyn_common.h @@ -37,7 +37,7 @@ DFI_SETUP_LOG_HEADER(dynCommon) ; TAILQ_HEAD(namvals_head, namval_entry); -struct CELIX_DFI_EXPORT namval_entry { +struct namval_entry { char *name; char *value; TAILQ_ENTRY(namval_entry) entries; diff --git a/libs/dfi/include/dyn_function.h b/libs/dfi/include/dyn_function.h index 1f59e981..269e9cbe 100644 --- a/libs/dfi/include/dyn_function.h +++ b/libs/dfi/include/dyn_function.h @@ -48,7 +48,7 @@ typedef struct _dyn_function_type dyn_function_type; DFI_SETUP_LOG_HEADER(dynFunction); DFI_SETUP_LOG_HEADER(dynAvprFunction); -enum CELIX_DFI_EXPORT dyn_function_argument_meta { +enum dyn_function_argument_meta { DYN_FUNCTION_ARGUMENT_META__STD = 0, DYN_FUNCTION_ARGUMENT_META__HANDLE = 1, DYN_FUNCTION_ARGUMENT_META__PRE_ALLOCATED_OUTPUT = 2, diff --git a/libs/dfi/include/dyn_type.h b/libs/dfi/include/dyn_type.h index 676a68eb..145dbfa3 100644 --- a/libs/dfi/include/dyn_type.h +++ b/libs/dfi/include/dyn_type.h @@ -116,20 +116,20 @@ extern "C" { typedef struct _dyn_type dyn_type; TAILQ_HEAD(types_head, type_entry); -struct CELIX_DFI_EXPORT type_entry { +struct type_entry { dyn_type *type; TAILQ_ENTRY(type_entry) entries; }; TAILQ_HEAD(complex_type_entries_head, complex_type_entry); -struct CELIX_DFI_EXPORT complex_type_entry { +struct complex_type_entry { dyn_type *type; char *name; TAILQ_ENTRY(complex_type_entry) entries; }; TAILQ_HEAD(meta_properties_head, meta_entry); -struct CELIX_DFI_EXPORT meta_entry { +struct meta_entry { char *name; char *value; TAILQ_ENTRY(meta_entry) entries; diff --git a/libs/etcdlib/CMakeLists.txt b/libs/etcdlib/CMakeLists.txt index 760b8bad..23a677c9 100644 --- a/libs/etcdlib/CMakeLists.txt +++ b/libs/etcdlib/CMakeLists.txt @@ -76,6 +76,7 @@ if (CELIX_ETCDLIB OR ETCDLIB_STANDALONE) add_library(etcdlib_static STATIC src/etcd.c) target_include_directories(etcdlib_static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>) target_include_directories(etcdlib_static PRIVATE src) + target_include_directories(etcdlib_static PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/celix/gen/includes/etcdlib>) set_target_properties(etcdlib_static PROPERTIES POSITION_INDEPENDENT_CODE 1
