From e330970fb9abeabdde0c2e17c229035c0f29abc1 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Fri, 25 Feb 2005 17:32:37 +0000
Subject: [PATCH] Fix GCC 4.0 build (bug #3662)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_modem_bestdata.c | 6 ++----
channels/chan_zap.c | 4 +++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/channels/chan_modem_bestdata.c b/channels/chan_modem_bestdata.c
index f923e478a4..ec24369dc6 100755
--- 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 7ad5b276a1..835eb94728 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -751,6 +751,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;
@@ -1983,7 +1985,7 @@ static int zt_hangup(struct ast_channel *ast)
{
int res;
int index,x, law;
- static int restore_gains(struct zt_pvt *p);
+ /*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;
--
GitLab