From 222d4676d1986edbdc2684202115a4cc75d1a2ac Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sat, 4 Sep 2010 18:08:19 +0000 Subject: [PATCH] Add a C++ compatible version of AST_CLI_DEFINE(). git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@285057 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/cli.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index 7258548b6f..21a03834de 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.