[asterisk-commits] trunk r13357 - in /trunk: include/asterisk/pbx.h pbx.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Mar 17 15:39:36 2006
New Revision: 13357

URL: http://svn.digium.com/view/asterisk?rev=13357&view=rev
Log:
move the definition of the mappings between extension states and their text
representation into pbx.c so that every file that includes pbx.h does not
unnecessarily get a copy of it

Modified:
    trunk/include/asterisk/pbx.h
    trunk/pbx.c

Modified: trunk/include/asterisk/pbx.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/pbx.h?rev=13357&r1=13356&r2=13357&view=diff
==============================================================================
--- trunk/include/asterisk/pbx.h (original)
+++ trunk/include/asterisk/pbx.h Fri Mar 17 15:39:36 2006
@@ -62,18 +62,6 @@
 };
 
 
-static const struct cfextension_states {
-	int extension_state;
-	const char * const text;
-} extension_states[] = {
-	{ AST_EXTENSION_NOT_INUSE,                     "Idle" },
-	{ AST_EXTENSION_INUSE,                         "InUse" },
-	{ AST_EXTENSION_BUSY,                          "Busy" },
-	{ AST_EXTENSION_UNAVAILABLE,                   "Unavailable" },
-	{ AST_EXTENSION_RINGING,                       "Ringing" },
-	{ AST_EXTENSION_INUSE | AST_EXTENSION_RINGING, "InUse&Ringing" }
-};
-
 struct ast_context;
 struct ast_exten;     
 struct ast_include;

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=13357&r1=13356&r2=13357&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Fri Mar 17 15:39:36 2006
@@ -194,6 +194,18 @@
 	int laststate; 			/*!< Last known state */
 	struct ast_state_cb *callbacks;	/*!< Callback list for this extension */
 	AST_LIST_ENTRY(ast_hint) list;	/*!< Pointer to next hint in list */
+};
+
+static const struct cfextension_states {
+	int extension_state;
+	const char * const text;
+} extension_states[] = {
+	{ AST_EXTENSION_NOT_INUSE,                     "Idle" },
+	{ AST_EXTENSION_INUSE,                         "InUse" },
+	{ AST_EXTENSION_BUSY,                          "Busy" },
+	{ AST_EXTENSION_UNAVAILABLE,                   "Unavailable" },
+	{ AST_EXTENSION_RINGING,                       "Ringing" },
+	{ AST_EXTENSION_INUSE | AST_EXTENSION_RINGING, "InUse&Ringing" }
 };
 
 int ast_pbx_outgoing_cdr_failed(void);