aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-08 21:35:12 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-08 21:35:12 +0000
commit82478d5a62b5199262bbffee5d401411d387d645 (patch)
tree7ce11f0ef607c4ab989e0f30c45042d58e06eb60 /include
parente329880829b84c59da1b1939124d60d8688ea90d (diff)
moving ast_devstate_to_extenstate to pbx.c from devicestate.c
ast_devstate_to_extenstate belongs in pbx.c. This change fixes a compile time error with chan_vpb as well. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@205409 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/devicestate.h9
-rw-r--r--include/asterisk/pbx.h8
2 files changed, 8 insertions, 9 deletions
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h
index e9f1c36f3..c1a5abcd8 100644
--- a/include/asterisk/devicestate.h
+++ b/include/asterisk/devicestate.h
@@ -152,15 +152,6 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg);
/*!
- * \brief Map devstate to an extension state.
- *
- * \param[in] device state
- *
- * \return the extension state mapping.
- */
-enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate);
-
-/*!
* \brief You shouldn't care about the contents of this struct
*
* This struct is only here so that it can be easily declared on the stack.
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 0b5adf79c..16c02f7fb 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -273,6 +273,14 @@ int ast_add_extension2(struct ast_context *con, int replace, const char *extensi
int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *), const char *registrar);
+/*!
+ * \brief Map devstate to an extension state.
+ *
+ * \param[in] device state
+ *
+ * \return the extension state mapping.
+ */
+enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate);
/*!
* \brief Register an application.