From 4619302f8fd1e241d4fdca6c3b1e22c54c69d542 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 12 Nov 2006 21:16:46 +0000 Subject: [PATCH] don't user "new" as a variable name, so we can keep compatible with C++ git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3336 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_ivr.h | 4 ++-- src/switch_ivr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h index 5ac938e033..65cf1c7395 100644 --- a/src/include/switch_ivr.h +++ b/src/include/switch_ivr.h @@ -436,7 +436,7 @@ typedef struct switch_ivr_menu_action switch_ivr_menu_action_t; /*! *\brief Create a new menu object. - *\param new the pointer to the new menu + *\param new_menu the pointer to the new menu *\param main The top level menu, (NULL if this is the top level one). *\param name A pointer to the name of this menu. *\param greeting_sound Optional pointer to a main sound (press 1 for this 2 for that). @@ -447,7 +447,7 @@ typedef struct switch_ivr_menu_action switch_ivr_menu_action_t; *\param pool memory pool (NULL to create one) *\return SWUTCH_STATUS_SUCCESS if the menu was created */ -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new, +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, switch_ivr_menu_t *main, char *name, char *greeting_sound, diff --git a/src/switch_ivr.c b/src/switch_ivr.c index cd5e49a11f..a2d7c20314 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -3308,7 +3308,7 @@ static void switch_ivr_menu_stack(switch_ivr_menu_t **top, switch_ivr_menu_t *bo } -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new, +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, switch_ivr_menu_t *main, char *name, char *greeting_sound, @@ -3385,7 +3385,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new, menu->flags |= SWITCH_IVR_MENU_FLAG_STACK; } - *new = menu; + *new_menu = menu; return SWITCH_STATUS_SUCCESS; }