diff options
| author | David M. Lee <dlee@digium.com> | 2013-05-10 15:55:42 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-05-10 15:55:42 +0000 |
| commit | db925c3f066fc73849af06bcfc966467af349891 (patch) | |
| tree | f6c288f4af9a93a389dc11eba5e108faaf0406a2 | |
| parent | 7ce05bfb9b5f06c18451e37bb5b91cd543d6ba84 (diff) | |
Avoided __ast names for the private variables created by the
STASIS_MESSAGE_TYPE_*() macros.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/stasis.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h index da8168746..8c77c2694 100644 --- a/include/asterisk/stasis.h +++ b/include/asterisk/stasis.h @@ -549,10 +549,10 @@ struct ao2_container *stasis_cache_dump(struct stasis_caching_topic *caching_top * \since 12 */ #define STASIS_MESSAGE_TYPE_DEFN(name) \ - static struct stasis_message_type *__ ## name; \ - struct stasis_message_type *name(void) { \ - ast_assert(__ ## name != NULL); \ - return __ ## name; \ + static struct stasis_message_type *_priv_ ## name; \ + struct stasis_message_type *name(void) { \ + ast_assert(_priv_ ## name != NULL); \ + return _priv_ ## name; \ } /*! @@ -563,16 +563,16 @@ struct ao2_container *stasis_cache_dump(struct stasis_caching_topic *caching_top * \return Non-zero on failure. * \since 12 */ -#define STASIS_MESSAGE_TYPE_INIT(name) \ - ({ \ - __ ## name = stasis_message_type_create(#name); \ - __ ## name ? 0 : -1; \ +#define STASIS_MESSAGE_TYPE_INIT(name) \ + ({ \ + _priv_ ## name = stasis_message_type_create(#name); \ + _priv_ ## name ? 0 : -1; \ }) -#define STASIS_MESSAGE_TYPE_CLEANUP(name) \ +#define STASIS_MESSAGE_TYPE_CLEANUP(name) \ ({ \ - ao2_cleanup(__ ## name); \ - __ ## name = NULL; \ + ao2_cleanup(_priv_ ## name); \ + _priv_ ## name = NULL; \ }) /*! @} */ |