[Asterisk-cvs] asterisk/channels chan_modem_bestdata.c, 1.12, 1.12.2.1 chan_zap.c, 1.344.2.12, 1.344.2.13

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	chan_modem_bestdata.c chan_zap.c 
Log Message:
move function prototypes outside of functions to compile under gcc4 (bug #3662)


Index: chan_modem_bestdata.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_modem_bestdata.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- chan_modem_bestdata.c	16 Jul 2004 04:40:54 -0000	1.12
+++ chan_modem_bestdata.c	25 Feb 2005 18:11:41 -0000	1.12.2.1
@@ -47,10 +47,10 @@
 	NULL
 };
 
-static int bestdata_startrec(struct ast_modem_pvt *p)
-{
 static int bestdata_break(struct ast_modem_pvt *p);
 
+static int bestdata_startrec(struct ast_modem_pvt *p)
+{
 	if (p->ministate != STATE_COMMAND) bestdata_break(p);
 	if (ast_modem_send(p, "AT+VRX", 0) ||
 	     ast_modem_expect(p, "CONNECT", 5)) {
@@ -63,8 +63,6 @@
 
 static int bestdata_startplay(struct ast_modem_pvt *p)
 {
-static int bestdata_break(struct ast_modem_pvt *p);
-
 	if (p->ministate != STATE_COMMAND) bestdata_break(p);
 	if (ast_modem_send(p, "AT+VTX", 0) ||
 	     ast_modem_expect(p, "CONNECT", 5)) {

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.344.2.12
retrieving revision 1.344.2.13
diff -u -d -r1.344.2.12 -r1.344.2.13
--- chan_zap.c	29 Jan 2005 07:19:10 -0000	1.344.2.12
+++ chan_zap.c	25 Feb 2005 18:11:41 -0000	1.344.2.13
@@ -706,6 +706,8 @@
 #endif		
 }
 
+static int restore_gains(struct zt_pvt *p);
+
 static void swap_subs(struct zt_pvt *p, int a, int b)
 {
 	int tchan;
@@ -1941,7 +1943,6 @@
 {
 	int res;
 	int index,x, law;
-	static int restore_gains(struct zt_pvt *p);
 	struct zt_pvt *p = ast->pvt->pvt;
 	struct zt_pvt *tmp = NULL;
 	struct zt_pvt *prev = NULL;