summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2013-03-28 15:45:18 +0000
committerKinsey Moore <kmoore@digium.com>2013-03-28 15:45:18 +0000
commit71206544a770eb4004294ed13613a7cde6e0e056 (patch)
tree7664e5ebef6d139f25c264946a7270b4141a8fe3 /include
parent1a2a4578d2ab7e1d1f1518a3f8bcc41f3fd13702 (diff)
Break the world. Stasis message type accessors should now all be named correctly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h6
-rw-r--r--include/asterisk/stasis.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 30a05a181..91d2f803c 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4186,7 +4186,7 @@ struct ast_channel_snapshot *ast_channel_snapshot_create(struct ast_channel *cha
*
* \retval Message type for \ref ast_channel_snapshot.
*/
-struct stasis_message_type *ast_channel_snapshot(void);
+struct stasis_message_type *ast_channel_snapshot_type(void);
/*!
* \since 12
@@ -4237,7 +4237,7 @@ struct ast_channel_blob {
*
* \retval Message type for \ref ast_channel_blob messages.
*/
-struct stasis_message_type *ast_channel_blob(void);
+struct stasis_message_type *ast_channel_blob_type(void);
/*!
* \since 12
@@ -4247,7 +4247,7 @@ struct stasis_message_type *ast_channel_blob(void);
* \return Type field value from the blob.
* \return \c NULL on error.
*/
-const char *ast_channel_blob_type(struct ast_channel_blob *obj);
+const char *ast_channel_blob_json_type(struct ast_channel_blob *obj);
/*!
* \since 12
diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h
index 936a75d53..07c3c5c6b 100644
--- a/include/asterisk/stasis.h
+++ b/include/asterisk/stasis.h
@@ -377,7 +377,7 @@ struct stasis_subscription_change {
* \return The stasis_message_type for subscription change notices
* \since 12
*/
-struct stasis_message_type *stasis_subscription_change(void);
+struct stasis_message_type *stasis_subscription_change_type(void);
/*! @} */
@@ -413,7 +413,7 @@ struct stasis_topic *stasis_topic_pool_get_topic(struct stasis_topic_pool *pool,
* \return Message type for cache update messages.
* \since 12
*/
-struct stasis_message_type *stasis_cache_update(void);
+struct stasis_message_type *stasis_cache_update_type(void);
/*!
* \brief Cache update message