From: Olle Johansson <oej@edvina.net>
Date: Sun, 5 Mar 2006 13:52:26 +0000 (+0000)
Subject: Oops
X-Git-Tag: 1.4.0-beta1~2489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a3c7299ac0e2fd5b97311b179422349a2f78b1;p=thirdparty%2Fasterisk.git

Oops


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c8954f1ce9..91a1e0d0b6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12339,7 +12339,7 @@ static int reload_config(enum channelreloadreason reason)
 	int auto_sip_domains = FALSE;
 	struct sockaddr_in old_bindaddr = bindaddr;
 	int registry_count = 0, peer_count = 0, user_count = 0;
-	int debugflag;
+	static struct ast_flags debugflag = {0};
 
 	cfg = ast_config_load(config);
 
diff --git a/res/Makefile b/res/Makefile
index 031c147b7c..9650d7bf30 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -32,7 +32,7 @@ ifeq (${OSPLIB},)
   MODS:=$(filter-out res_osp.so,$(MODS))
 endif
 
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/xusr/include/net-snmp/net-snmp-config.h),)
   MODS:=$(filter-out res_snmp.so,$(MODS))
 else
   SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)