diff options
author | Patrick McHardy <kaber@trash.net> | 2010-07-26 23:18:05 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-07-26 23:18:05 +0200 |
commit | 5c1320175d352c5f8e845d628800dc4b220ed47c (patch) | |
tree | f94b3f13a8749bb1baa70b1f9f202acb4e518d4d | |
parent | fee1f097f26667408d2a9fc960f915de239f49c8 (diff) |
libdect: include cleanup - misc cleanups
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | include/debug.h | 1 | ||||
-rw-r--r-- | include/dect/debug.h | 3 | ||||
-rw-r--r-- | include/dect/identities.h | 3 | ||||
-rw-r--r-- | include/dect/ie.h | 5 | ||||
-rw-r--r-- | include/s_fmt.h | 4 | ||||
-rw-r--r-- | include/utils.h | 2 | ||||
-rw-r--r-- | src/ie.c | 5 |
7 files changed, 17 insertions, 6 deletions
diff --git a/include/debug.h b/include/debug.h index 50371e4..3a9d86e 100644 --- a/include/debug.h +++ b/include/debug.h @@ -2,6 +2,7 @@ #define _LIBDECT_DEBUG_H #include <utils.h> +#include <dect/debug.h> extern void __dect_debug(enum dect_debug_subsys subsys, const char *fmt, ...) __fmtstring(2, 3); extern void __dect_hexdump(enum dect_debug_subsys subsys, const char *prefix, diff --git a/include/dect/debug.h b/include/dect/debug.h index 5433fca..3a79579 100644 --- a/include/dect/debug.h +++ b/include/dect/debug.h @@ -5,6 +5,9 @@ extern "C" { #endif +#include <stdarg.h> +#include <dect/utils.h> + /** * @addtogroup debug * @{ diff --git a/include/dect/identities.h b/include/dect/identities.h index 91eebe9..346c244 100644 --- a/include/dect/identities.h +++ b/include/dect/identities.h @@ -11,6 +11,9 @@ extern "C" { #endif +#include <stdint.h> +#include <stdbool.h> + /** * @addtogroup identity * @{ diff --git a/include/dect/ie.h b/include/dect/ie.h index ce18fd2..1920d87 100644 --- a/include/dect/ie.h +++ b/include/dect/ie.h @@ -16,8 +16,11 @@ extern "C" { * @{ */ +#include <stdbool.h> #include <string.h> + #include <dect/utils.h> +#include <dect/identities.h> struct dect_handle; @@ -34,6 +37,8 @@ struct dect_ie_collection { struct dect_ie_common *ie[]; }; +extern void *dect_ie_collection_alloc(const struct dect_handle *dh, unsigned int size); + extern struct dect_ie_collection *__dect_ie_collection_hold(struct dect_ie_collection *iec); #define dect_ie_collection_hold(iec) ((void *)__dect_ie_collection_hold(&(iec)->common)) diff --git a/include/s_fmt.h b/include/s_fmt.h index 8332758..dd25ca3 100644 --- a/include/s_fmt.h +++ b/include/s_fmt.h @@ -7,6 +7,8 @@ #ifndef _LIBDECT_S_FMT_H #define _LIBDECT_S_FMT_H +#include <dect/ie.h> + /* * S-Format message header */ @@ -407,8 +409,6 @@ struct dect_msg_common { struct dect_ie_common *ie[0]; }; -extern void *dect_ie_collection_alloc(const struct dect_handle *dh, unsigned int size); - struct dect_msg_buf; extern enum dect_sfmt_error dect_parse_sfmt_msg(const struct dect_handle *dh, const struct dect_sfmt_msg_desc *desc, diff --git a/include/utils.h b/include/utils.h index 6248d21..95b981c 100644 --- a/include/utils.h +++ b/include/utils.h @@ -2,6 +2,8 @@ #define _LIBDECT_UTILS_H #include <assert.h> +#include <stddef.h> +#include <stdint.h> #ifndef AF_DECT #define AF_DECT 38 @@ -19,11 +19,8 @@ #include <inttypes.h> #include <asm/byteorder.h> +#include <dect/ie.h> #include <libdect.h> -#include <identities.h> -#include <utils.h> -#include <s_fmt.h> -#include <lce.h> #if 0 #define refcnt_debug(fmt, ...) dect_debug(fmt, ## __VA_ARGS__) |