From owner-svn-src-all@FreeBSD.ORG  Mon Mar 19 11:47:38 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8EAE11065673;
	Mon, 19 Mar 2012 11:47:38 +0000 (UTC)
	(envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79BAE8FC08;
	Mon, 19 Mar 2012 11:47:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JBlcFq067044;
	Mon, 19 Mar 2012 11:47:38 GMT
	(envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JBlcSo067042;
	Mon, 19 Mar 2012 11:47:38 GMT
	(envelope-from theraven@svn.freebsd.org)
Message-Id: <201203191147.q2JBlcSo067042@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Mon, 19 Mar 2012 11:47:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233173 - head/lib/libc/locale
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2012 11:47:38 -0000

Author: theraven
Date: Mon Mar 19 11:47:37 2012
New Revision: 233173
URL: http://svn.freebsd.org/changeset/base/233173

Log:
  Make __get_locale() static inline, not just inline, so when compiling libc in
  debug mode (without optimisations) it doesn't generate a linker failure.
  
  Approved by:	dim (mentor)

Modified:
  head/lib/libc/locale/xlocale_private.h

Modified: head/lib/libc/locale/xlocale_private.h
==============================================================================
--- head/lib/libc/locale/xlocale_private.h	Mon Mar 19 11:32:42 2012	(r233172)
+++ head/lib/libc/locale/xlocale_private.h	Mon Mar 19 11:47:37 2012	(r233173)
@@ -191,7 +191,7 @@ extern _Thread_local locale_t __thread_l
  * this call is not guaranteed to remain valid after the locale changes.  As
  * such, this should only be called within libc functions.
  */
-inline locale_t __get_locale(void)
+static inline locale_t __get_locale(void)
 {
 
 	if (!__has_thread_locale) {