diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-09-04 18:10:46 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-09-04 18:10:46 +0000 |
| commit | d8a49683ead518a14e8de9b9d0c9ef3479add9cd (patch) | |
| tree | 1732f956e821db18fd31f32c54e917d10ad28870 | |
| parent | 3b5727bf381fcbf349f6eeda400c548af770e472 (diff) | |
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().
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/cli.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index 7258548b6..21a03834d 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -183,9 +183,13 @@ struct ast_cli_entry { 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. |