[asterisk-commits] pcadach: branch pcadach/chan_h323-live r42603 - in /team/pcadach/chan_h323-li...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Sat Sep  9 15:45:41 2006
New Revision: 42603

URL: http://svn.digium.com/view/asterisk?rev=3D42603&view=3Drev
Log:
Lets Asterisk build under RH 7.3 - don't use declarations within code

Modified:
    team/pcadach/chan_h323-live/apps/app_voicemail.c
    team/pcadach/chan_h323-live/pbx/pbx_ael.c

Modified: team/pcadach/chan_h323-live/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/apps/a=
pp_voicemail.c?rev=3D42603&r1=3D42602&r2=3D42603&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- team/pcadach/chan_h323-live/apps/app_voicemail.c (original)
+++ team/pcadach/chan_h323-live/apps/app_voicemail.c Sat Sep  9 15:45:41 20=
06
@@ -4600,12 +4600,15 @@
 static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)
 {
 	int x =3D 0;
+#ifndef IMAP_STORAGE
+	int res =3D 0, nummsg;
+#endif
+
 	if (vms->lastmsg <=3D -1)
 		goto done;
 =

 	vms->curmsg =3D -1; =

 #ifndef IMAP_STORAGE
-	int res =3D 0, nummsg;
 	/* Get the deleted messages fixed */ =

 	if (vm_lock_path(vms->curdir))
 		return ERROR_LOCK_PATH;

Modified: team/pcadach/chan_h323-live/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/pbx/pb=
x_ael.c?rev=3D42603&r1=3D42602&r2=3D42603&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- team/pcadach/chan_h323-live/pbx/pbx_ael.c (original)
+++ team/pcadach/chan_h323-live/pbx/pbx_ael.c Sat Sep  9 15:45:41 2006
@@ -1056,6 +1056,7 @@
 	   The method:  well, for each label, find the first label in the context
 	   with the same name. If it's not the current label, then throw an error=
. */
 	struct pval *curr;
+	struct pval *x;
 	=

 	/* printf("=3D=3D=3D=3D check_label:   =3D=3D=3D=3D\n"); */
 	if( !current_extension )
@@ -1063,7 +1064,7 @@
 	else
 		curr =3D current_extension;
 	=

-	struct pval *x =3D find_first_label_in_current_context((char *)item->u1.s=
tr, curr);
+	x =3D find_first_label_in_current_context((char *)item->u1.str, curr);
 	/* printf("Hey, check_label found with item =3D %x, and x is %x, and curr=
cont is %x, label name is %s\n", item,x, current_context, (char *)item->u1.=
str); */
 	if( x && x !=3D item )
 	{