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 c8954f1ce951b4c889c3a1253c3f496005e74795..91a1e0d0b6ef87c84ef1c7804182b9979c896c89 100644 (file)
--- 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 031c147b7c731ffc76ecaebc1496adcfc0f36453..9650d7bf302f1310629940a135224209a7d519f6 100644 (file)
--- 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)