diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 22:16:18 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 22:16:18 +0000 |
| commit | ed4c3cd1f04b4803afe7b6c040f3e210672693c2 (patch) | |
| tree | 96402db65cc0d6728a711cecfd529738078749b4 /include | |
| parent | 6fec666bc302e9dccd94e5ef52ba2147d75d2e32 (diff) | |
Merged revisions 205412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r205412 | dvossel | 2009-07-08 17:15:06 -0500 (Wed, 08 Jul 2009) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@205414 f38db490-d61c-443f-a65b-d21fe96a405b
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 a88546ff9..dd2cb9095 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -248,15 +248,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 c6b3c7cb8..ed21159c5 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" @@ -320,6 +321,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 |