[Asterisk-cvs] asterisk/include/asterisk app.h,1.30,1.31

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv1337/include/asterisk

Modified Files:
	app.h 
Log Message:
Fix build of new IVR stuff for GCC 2.96 and later gcc's too (bug #3639)


Index: app.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/app.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- app.h	17 Feb 2005 20:04:10 -0000	1.30
+++ app.h	26 Feb 2005 19:06:09 -0000	1.31
@@ -59,9 +59,14 @@
 struct ast_ivr_menu {
 	char *title;		/* Title of menu */
 	unsigned int flags;	/* Flags */
-	struct ast_ivr_option options[];	/* All options */
+	struct ast_ivr_option *options;	/* All options */
 };
 
+#define AST_IVR_DECLARE_MENU(holder,title,flags,foo...) \
+	static struct ast_ivr_option __options_##holder[] = foo;\
+	static struct ast_ivr_menu holder = { title, flags, __options_##holder }
+	
+
 /*! Runs an IVR menu, returns 0 on successful completion, -1 on hangup, or -2 on user error in menu */
 extern int ast_ivr_menu_run(struct ast_channel *c, struct ast_ivr_menu *menu, void *cbdata);