diff options
| author | David Vossel <dvossel@digium.com> | 2009-07-08 22:15:06 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-07-08 22:15:06 +0000 |
| commit | e39a252b1e64f9118822e8cff96981a34faa57f9 (patch) | |
| tree | b89e706ca59cc581e69daa23ba52a5af347f9314 /include | |
| parent | b99f857fbd19c1805ceac4b3cad1103fbe1f32b4 (diff) | |
Merged revisions 205409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r205409 | dvossel | 2009-07-08 16:35:12 -0500 (Wed, 08 Jul 2009) | 6 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@205412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/devicestate.h | 9 | ||||
| -rw-r--r-- | include/asterisk/pbx.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h index ff4cdd40b..4c516870e 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -249,15 +249,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 0a5819bb6..67d2227fa 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -24,6 +24,7 @@ #define _ASTERISK_PBX_H #include "asterisk/sched.h" +#include "asterisk/devicestate.h" #include "asterisk/chanvars.h" #include "asterisk/hashtab.h" #include "asterisk/stringfields.h" @@ -361,6 +362,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 Uses hint and devicestate callback to get the state of an extension |