[asterisk-commits] russell: trunk r285058 - in /trunk: ./ include/asterisk/cli.h

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Sep  4 13:10:46 2010
New Revision: 285058

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285058
Log:
Merged revisions 285057 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285057 | russell | 2010-09-04 13:08:19 -0500 (Sat, 04 Sep 2010) | 2 lines
  
  Add a C++ compatible version of AST_CLI_DEFINE().
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/cli.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/cli.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/cli.h?view=diff&rev=285058&r1=285057&r2=285058
==============================================================================
--- trunk/include/asterisk/cli.h (original)
+++ trunk/include/asterisk/cli.h Sat Sep  4 13:10:46 2010
@@ -183,9 +183,13 @@
 	AST_LIST_ENTRY(ast_cli_entry) list;
 };
 
+#if defined(__cplusplus) || defined(c_plusplus)
+#define AST_CLI_DEFINE(fn, txt) { { "" }, txt, NULL, 0, NULL, NULL, 0, 0, NULL, fn }
+#else
 /* XXX the parser in gcc 2.95 gets confused if you don't put a space
  * between the last arg before VA_ARGS and the comma */
 #define AST_CLI_DEFINE(fn, txt , ... )	{ .handler = fn, .summary = txt, ## __VA_ARGS__ }
+#endif
 
 /*!
  * Helper function to generate cli entries from a NULL-terminated array.