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
This commit is contained in:
parent
0cc47e4221
commit
f89608896c
|
@ -68,12 +68,6 @@ void ast_event_init(void); /*!< Provided by event.c */
|
|||
int ast_device_state_engine_init(void); /*!< Provided by devicestate.c */
|
||||
int astobj2_init(void); /*! Provided by astobj2.c */
|
||||
|
||||
/* Many headers need 'ast_channel' to be defined */
|
||||
struct ast_channel;
|
||||
|
||||
/* Many headers need 'ast_module' to be defined */
|
||||
struct ast_module;
|
||||
|
||||
/*!
|
||||
* \brief Reload asterisk modules.
|
||||
* \param name the name of the module to reload
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct ast_channel;
|
||||
struct ast_frame;
|
||||
|
||||
/* Configuration flags */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1835,8 +1835,6 @@ AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
|
|||
#define ast_channel_trylock(x) ast_mutex_trylock(&x->lock)
|
||||
#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);
|
||||
|
|
Reference in New Issue