From: Colin McCabe <cmccabe@xxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Colin McCabe <cmccabe@xxxxxxxxxxxxxx> --- include/cld_msg.h | 10 ---------- include/cldc.h | 1 + include/common.h | 11 +++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 include/common.h diff --git a/include/cld_msg.h b/include/cld_msg.h index 641b857..01837b7 100644 --- a/include/cld_msg.h +++ b/include/cld_msg.h @@ -250,14 +250,4 @@ struct cld_msg_event { uint8_t res[4]; }; -/* - * function prototypes for lib/common.c; - * ideally these should not be in cld_msg.h - */ - -extern unsigned long long cld_sid2llu(const uint8_t *sid); -extern void __cld_rand64(void *p); -extern const char *cld_errstr(enum cle_err_codes ecode); -extern int cld_readport(const char *fname); - #endif /* __CLD_MSG_H__ */ diff --git a/include/cldc.h b/include/cldc.h index 9ae6dfe..3f0deb5 100644 --- a/include/cldc.h +++ b/include/cldc.h @@ -5,6 +5,7 @@ #include <stdbool.h> #include <glib.h> #include <cld_msg.h> +#include <common.h> struct cldc_session; diff --git a/include/common.h b/include/common.h new file mode 100644 index 0000000..52e5603 --- /dev/null +++ b/include/common.h @@ -0,0 +1,11 @@ +#ifndef __CLD_COMMON_H__ +#define __CLD_COMMON_H__ + +#include <stdint.h> + +unsigned long long cld_sid2llu(const uint8_t *sid); +void __cld_rand64(void *p); +const char *cld_errstr(enum cle_err_codes ecode); +int cld_readport(const char *fname); + +#endif /* __CLD_COMMON_H__ */ -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe hail-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html