[asterisk-commits] dlee: branch dlee/playback r388321 - in /team/dlee/playback: ./ include/aster...

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri May 10 10:58:36 2013
New Revision: 388321

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388321
Log:
Avoided __ast names for the private variables created by the 
STASIS_MESSAGE_TYPE_*() macros.
........

Merged revisions 388318 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/dlee/playback/   (props changed)
    team/dlee/playback/include/asterisk/stasis.h

Propchange: team/dlee/playback/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 10 10:58:36 2013
@@ -1,1 +1,1 @@
-/trunk:1-388299
+/trunk:1-388320

Modified: team/dlee/playback/include/asterisk/stasis.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis.h?view=diff&rev=388321&r1=388320&r2=388321
==============================================================================
--- team/dlee/playback/include/asterisk/stasis.h (original)
+++ team/dlee/playback/include/asterisk/stasis.h Fri May 10 10:58:36 2013
@@ -549,10 +549,10 @@
  * \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 @@
  * \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;		\
 	})
 
 /*! @} */