From owner-svn-src-head@FreeBSD.ORG  Tue Mar  6 21:56:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3FC2106566C;
	Tue,  6 Mar 2012 21:56:30 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B3BE48FC0C;
	Tue,  6 Mar 2012 21:56:30 +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 q26LuU7R059189;
	Tue, 6 Mar 2012 21:56:30 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26LuUsd059187;
	Tue, 6 Mar 2012 21:56:30 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203062156.q26LuUsd059187@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 6 Mar 2012 21:56:30 +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: r232626 - head/lib/libc/locale
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 21:56:30 -0000

Author: dim
Date: Tue Mar  6 21:56:30 2012
New Revision: 232626
URL: http://svn.freebsd.org/changeset/base/232626

Log:
  Fix build of libc.so after r232620.  This caused a duplicate definition
  of __getCurrentRuneLocale().
  
  Pointy hat to:	me

Modified:
  head/lib/libc/locale/nomacros.c

Modified: head/lib/libc/locale/nomacros.c
==============================================================================
--- head/lib/libc/locale/nomacros.c	Tue Mar  6 21:20:16 2012	(r232625)
+++ head/lib/libc/locale/nomacros.c	Tue Mar  6 21:56:30 2012	(r232626)
@@ -9,4 +9,10 @@ __FBSDID("$FreeBSD$");
  */
 #define _EXTERNALIZE_CTYPE_INLINES_
 
+/*
+ * Also make sure <runetype.h> does not generate an inline definition
+ * of __getCurrentRuneLocale().
+ */
+#define __RUNETYPE_INTERNAL
+
 #include <ctype.h>