From: Matthew Jordan <mjordan@digium.com>
Date: Sun, 7 Oct 2012 17:31:53 +0000 (+0000)
Subject: Trivial patch to make 'best_score' defined for all architectures.
X-Git-Tag: 11.0.0-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d99578264be79733e1160c7febbb92a957586a49;p=thirdparty%2Fasterisk.git

Trivial patch to make 'best_score' defined for all architectures.

Fixes trivial build error on Solaris:

  acl.c: In function `get_local_address':
  acl.c:196: error: `best_score' undeclared (first use in this function)
  acl.c:196: error: (Each undeclared identifier is reported only once
  acl.c:196: error: for each function it appears in.)
  make[2]: *** [acl.o] Error 1

(issue ASTERISK-20366)
Reported by: Ben Klang
Tested by: Ben Klang
patches:
  0002-main-acl.c-Trivial.-best_score-should-be-defined-for.patch by Shaun Ruffell (license 5417)



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

diff --git a/main/acl.c b/main/acl.c
index 3c28107534..60806f4ded 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -131,9 +131,9 @@ static int get_local_address(struct ast_sockaddr *ourip)
 	struct ifaddrs *ifap, *ifaphead;
 	int rtnerr;
 	const struct sockaddr_in *sin;
-	int best_score = -100;
 #endif /* BSD_OR_LINUX */
 	struct in_addr best_addr;
+	int best_score = -100;
 	memset(&best_addr, 0, sizeof(best_addr));
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__GLIBC__)