diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-19 19:36:32 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-19 19:36:32 +0000 |
| commit | f89608896cf48f3825baf9a2590d70b5794f4732 (patch) | |
| tree | 583d35d6037430538541fd788901c505ba9fe267 /include/asterisk | |
| parent | 0cc47e4221b233d9cd912c9b7f21f49d80a7ec13 (diff) | |
move the declaration of struct ast_channel ast_frame and ast_module
to compat.h so it is always available - hopefully this will let
us reduce the number of inclusions of channel.h and frame.h
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89426 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/abstract_jb.h | 1 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 10 | ||||
| -rw-r--r-- | include/asterisk/lock.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h index 1bd9dc84d..4a41c8c2c 100644 --- a/include/asterisk/abstract_jb.h +++ b/include/asterisk/abstract_jb.h @@ -36,7 +36,6 @@ extern "C" { #endif -struct ast_channel; struct ast_frame; /* Configuration flags */ diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index d918cd707..19ae6e9b1 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -176,4 +176,14 @@ typedef unsigned int u_int32_t; typedef unsigned long long uint64_t; #endif +/*! \brief + * Definition of various structures that many asterisk files need, + * but only because they need to know that the type exists. + * + * We can move them to a different global header if necessary. + */ +struct ast_channel; +struct ast_frame; +struct ast_module; + #endif diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 16ce5bb67..055ec84c8 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1185,8 +1185,6 @@ AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p), #define ast_channel_trylock(x) ast_mutex_trylock(&x->lock_dont_use) #else -struct ast_channel; - /*! \brief Lock AST channel (and print debugging output) \note You need to enable DEBUG_CHANNEL_LOCKS for this function */ int ast_channel_lock(struct ast_channel *chan); |