move function prototypes outside of functions to compile under gcc4 (bug #3662)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c
index ddcb720182346c1cca335baebe685dabea290338..94e49ddd13d03a4d4cfb6c1d490488570a7ed39b 100755 (executable)
--- a/channels/chan_modem_bestdata.c
+++ b/channels/chan_modem_bestdata.c
@@ -47,10 +47,10 @@ static char *bestdata_idents[] = {
        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_break(struct ast_modem_pvt *p);
 
 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)) {

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 72b22af7765061874f55b4cda89c5b26d992dc12..0b7054fdc04432449b6611192cce95365966f34a 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -706,6 +706,8 @@ static void zap_queue_frame(struct zt_pvt *p, struct ast_frame *f, void *pri)
 #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 @@ static int zt_hangup(struct ast_channel *ast)
 {
        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;