From e1eeb63e1aa4a34ecc6bcaf46e205cf21cf20178 Mon Sep 17 00:00:00 2001 From: Parker Liu Date: Mon, 30 Aug 2021 14:32:48 +0800 Subject: [PATCH] Add judgement of cplusplus in all header files of include --- include/idhash.h | 8 ++++++++ include/mem_alloc.h | 10 +++++++++- include/neu_atomic_data.h | 8 ++++++++ include/neu_datatag_table.h | 1 + include/neu_list.h | 10 +++++++++- include/neu_log.h | 8 ++++++++ include/neu_panic.h | 8 ++++++++ include/neu_plugin.h | 8 ++++++++ include/neu_tag_group_config.h | 8 ++++++++ include/neu_vector.h | 8 ++++++++ include/neuron.h | 8 ++++++++ 11 files changed, 83 insertions(+), 2 deletions(-) diff --git a/include/idhash.h b/include/idhash.h index de5790bf..61da9f28 100644 --- a/include/idhash.h +++ b/include/idhash.h @@ -20,6 +20,10 @@ #ifndef __NEU_IDHASH_H__ #define __NEU_IDHASH_H__ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -57,4 +61,8 @@ extern int neu_id_set(neu_id_map *, uint32_t, void *); extern int neu_id_alloc(neu_id_map *, uint32_t *, void *); extern int neu_id_remove(neu_id_map *, uint32_t); +#ifdef __cplusplus +} +#endif + #endif // __NEU_IDHASH_H__ diff --git a/include/mem_alloc.h b/include/mem_alloc.h index 34e2bc91..5b388a48 100644 --- a/include/mem_alloc.h +++ b/include/mem_alloc.h @@ -23,6 +23,10 @@ #include "neu_panic.h" #include +#ifdef __cplusplus +extern "C" { +#endif + #define NEU_ARG_UNUSED(x) ((void) x) void *neu_alloc(size_t sz); @@ -34,4 +38,8 @@ void neu_free(void *b, size_t z); #define NEU_ALLOC_STRUCTS(s, n) neu_zalloc(sizeof(*s) * n) #define NEU_FREE_STRUCTS(s, n) neu_free(s, sizeof(*s) * n) -#endif \ No newline at end of file +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/neu_atomic_data.h b/include/neu_atomic_data.h index f458b6f2..f7da2e70 100644 --- a/include/neu_atomic_data.h +++ b/include/neu_atomic_data.h @@ -20,6 +20,10 @@ #ifndef NEURON_ATOMIC_H_ #define NEURON_ATOMIC_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -71,4 +75,8 @@ extern void neu_atomic_inc(neu_atomic_int *); // true if the value was set. extern bool neu_atomic_cas(neu_atomic_int *, int, int); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neu_datatag_table.h b/include/neu_datatag_table.h index a97bbc9e..6f06f6f3 100644 --- a/include/neu_datatag_table.h +++ b/include/neu_datatag_table.h @@ -40,4 +40,5 @@ datatag_id_t neu_datatag_tbl_add(neu_datatag_table_t *, neu_datatag_t *); #ifdef __cplusplus } #endif + #endif //__DATATAG_TABLE_H__ diff --git a/include/neu_list.h b/include/neu_list.h index a1641103..70954bdc 100644 --- a/include/neu_list.h +++ b/include/neu_list.h @@ -20,6 +20,10 @@ #ifndef __NEU_LIST_H__ #define __NEU_LIST_H__ +#ifdef __cplusplus +extern "C" { +#endif + #include // In order to make life easy, we just define the list structures @@ -61,4 +65,8 @@ extern void neu_list_node_remove(neu_list_node *); #define NEU_LIST_FOREACH(l, it) \ for (it = neu_list_first(l); it != NULL; it = neu_list_next(l, it)) -#endif // __NEU_LIST_H__ \ No newline at end of file +#ifdef __cplusplus +} +#endif + +#endif // __NEU_LIST_H__ diff --git a/include/neu_log.h b/include/neu_log.h index ddb12f2b..290c1ca7 100644 --- a/include/neu_log.h +++ b/include/neu_log.h @@ -20,6 +20,10 @@ #ifndef NEURON_LOG_H #define NEURON_LOG_H +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -74,4 +78,8 @@ extern void log_log(int level, const char *file, int line, const char *func, #define log_fatal(...) \ log_log(LOG_FATAL, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neu_panic.h b/include/neu_panic.h index 947bd0f6..4971ea17 100644 --- a/include/neu_panic.h +++ b/include/neu_panic.h @@ -20,6 +20,10 @@ #ifndef NEURON_PANIC_H #define NEURON_PANIC_H +#ifdef __cplusplus +extern "C" { +#endif + #include "neu_log.h" #include @@ -34,4 +38,8 @@ void neu_panic(const char *fmt, ...); #define NEU_ASSERT(x) (0) #endif +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neu_plugin.h b/include/neu_plugin.h index e7f23d9c..3fa945c6 100644 --- a/include/neu_plugin.h +++ b/include/neu_plugin.h @@ -20,6 +20,10 @@ #ifndef NEURON_PLUGIN_H #define NEURON_PLUGIN_H +#ifdef __cplusplus +extern "C" { +#endif + #include "neu_adapter.h" #define NEURON_PLUGIN_VER_1_0 100 @@ -57,4 +61,8 @@ typedef struct neu_plugin_module { const neu_plugin_intf_funs_t *intf_funs; } neu_plugin_module_t; +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neu_tag_group_config.h b/include/neu_tag_group_config.h index 7a32ae09..d205d5b2 100644 --- a/include/neu_tag_group_config.h +++ b/include/neu_tag_group_config.h @@ -20,6 +20,10 @@ #ifndef NEURON_TAG_GROUP_CONFIG_H #define NEURON_TAG_GROUP_CONFIG_H +#ifdef __cplusplus +extern "C" { +#endif + #include "neu_vector.h" typedef struct neu_taggrp_config neu_taggrp_config_t; @@ -38,4 +42,8 @@ const vector_t *neu_taggrp_cfg_ref_subpipes(neu_taggrp_config_t *grp_config); vector_t * neu_taggrp_cfg_get_datatag_ids(neu_taggrp_config_t *grp_config); const vector_t *neu_taggrp_cfg_ref_datatag_ids(neu_taggrp_config_t *grp_config); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neu_vector.h b/include/neu_vector.h index 0da0f651..de3209da 100644 --- a/include/neu_vector.h +++ b/include/neu_vector.h @@ -20,6 +20,10 @@ #ifndef NEU_VECTOR_H #define NEU_VECTOR_H +#ifdef __cplusplus +extern "C" { +#endif + #include "vector.h" typedef struct Vector vector_t; @@ -49,4 +53,8 @@ static inline void vector_free(vector_t *vec) return; } +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/neuron.h b/include/neuron.h index b0821b7a..356c7649 100644 --- a/include/neuron.h +++ b/include/neuron.h @@ -20,6 +20,10 @@ #ifndef _NEURON_H_ #define _NEURON_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include "neu_adapter.h" #include "neu_list.h" #include "neu_log.h" @@ -28,4 +32,8 @@ #include "neu_types.h" #include "neu_vector.h" +#ifdef __cplusplus +} +#endif + #endif