[asterisk-commits] rizzo: trunk r89426 - in /trunk: include/ include/asterisk/ utils/

[SVN commits to the Asterisk project]

Author: rizzo
Date: Mon Nov 19 13:36:32 2007
New Revision: 89426

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89426
Log:
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


Modified:
    trunk/include/asterisk.h
    trunk/include/asterisk/abstract_jb.h
    trunk/include/asterisk/compat.h
    trunk/include/asterisk/lock.h
    trunk/utils/extconf.c

Modified: trunk/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk.h?view=diff&rev=89426&r1=89425&r2=89426
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Mon Nov 19 13:36:32 2007
@@ -68,12 +68,6 @@
 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

Modified: trunk/include/asterisk/abstract_jb.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/abstract_jb.h?view=diff&rev=89426&r1=89425&r2=89426
==============================================================================
--- trunk/include/asterisk/abstract_jb.h (original)
+++ trunk/include/asterisk/abstract_jb.h Mon Nov 19 13:36:32 2007
@@ -36,7 +36,6 @@
 extern "C" {
 #endif
 
-struct ast_channel;
 struct ast_frame;
 
 /* Configuration flags */

Modified: trunk/include/asterisk/compat.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/compat.h?view=diff&rev=89426&r1=89425&r2=89426
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Mon Nov 19 13:36:32 2007
@@ -176,4 +176,14 @@
 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

Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=89426&r1=89425&r2=89426
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Mon Nov 19 13:36:32 2007
@@ -1185,8 +1185,6 @@
 #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);

Modified: trunk/utils/extconf.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/extconf.c?view=diff&rev=89426&r1=89425&r2=89426
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Mon Nov 19 13:36:32 2007
@@ -1834,8 +1834,6 @@
 	in the Makefile, print relevant output for debugging */
 #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 */