[asterisk-commits] mjordan: trunk r374633 - in /trunk: ./ main/acl.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Oct  7 12:33:38 2012
New Revision: 374633

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374633
Log:
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)
........

Merged revisions 374632 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/acl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/acl.c?view=diff&rev=374633&r1=374632&r2=374633
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Sun Oct  7 12:33:38 2012
@@ -131,9 +131,9 @@
 	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__)