[Asterisk-cvs] asterisk/apps app_ivrdemo.c,1.2,1.3

[markster at lists.digium.com]

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

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


Index: app_ivrdemo.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_ivrdemo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- app_ivrdemo.c	17 Feb 2005 18:07:33 -0000	1.2
+++ app_ivrdemo.c	26 Feb 2005 19:06:09 -0000	1.3
@@ -34,20 +34,20 @@
 	return 0;
 }
 
-static struct ast_ivr_menu ivr_submenu = {
-	"IVR Demo Sub Menu", 0, {
-	{ "s", AST_ACTION_BACKGROUND, "demo-abouttotry" },
-	{ "1", AST_ACTION_PLAYBACK, "digits/1" },
-	{ "1", AST_ACTION_PLAYBACK, "digits/1" },
-	{ "1", AST_ACTION_RESTART },
-	{ "2", AST_ACTION_PLAYLIST, "digits/2;digits/3" },
-	{ "*", AST_ACTION_REPEAT },
-	{ "#", AST_ACTION_UPONE  },
-	{ NULL },
-}};
+AST_IVR_DECLARE_MENU(ivr_submenu, "IVR Demo Sub Menu", 0, 
+{
+		{ "s", AST_ACTION_BACKGROUND, "demo-abouttotry" },
+		{ "1", AST_ACTION_PLAYBACK, "digits/1" },
+		{ "1", AST_ACTION_PLAYBACK, "digits/1" },
+		{ "1", AST_ACTION_RESTART },
+		{ "2", AST_ACTION_PLAYLIST, "digits/2;digits/3" },
+		{ "*", AST_ACTION_REPEAT },
+		{ "#", AST_ACTION_UPONE  },
+		{ NULL }
+});
 
-static struct ast_ivr_menu ivr_demo = {
-	"IVR Demo Main Menu", 0, {
+AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0, 
+{
 	{ "s", AST_ACTION_BACKGROUND, "demo-congrats" },
 	{ "g", AST_ACTION_BACKGROUND, "demo-instruct" },
 	{ "g", AST_ACTION_WAITOPTION },
@@ -59,7 +59,7 @@
 	{ "i", AST_ACTION_REPEAT, (void *)2 },
 	{ "#", AST_ACTION_EXIT },
 	{ NULL },
-}};
+});
 
 STANDARD_LOCAL_USER;