From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jun 10 12:51:58 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BAD8A106566C;
	Wed, 10 Jun 2009 12:51:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8FFE8FC22;
	Wed, 10 Jun 2009 12:51:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ACpwJY013613;
	Wed, 10 Jun 2009 12:51:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ACpw9d013611;
	Wed, 10 Jun 2009 12:51:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906101251.n5ACpw9d013611@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 10 Jun 2009 12:51:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193910 - stable/7/lib/libkse
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 12:51:59 -0000

Author: des
Date: Wed Jun 10 12:51:58 2009
New Revision: 193910
URL: http://svn.freebsd.org/changeset/base/193910

Log:
  merge r176055, r176056: use libc's version definition file.

Modified:
  stable/7/lib/libkse/   (props changed)
  stable/7/lib/libkse/Makefile
  stable/7/lib/libkse/kse.map

Modified: stable/7/lib/libkse/Makefile
==============================================================================
--- stable/7/lib/libkse/Makefile	Wed Jun 10 12:47:54 2009	(r193909)
+++ stable/7/lib/libkse/Makefile	Wed Jun 10 12:51:58 2009	(r193910)
@@ -41,7 +41,8 @@ WARNS?=3
 # Enable extra internal consistancy checks.
 CFLAGS+=-D_PTHREADS_INVARIANTS -Wall
 
-VERSION_MAP=${.CURDIR}/kse.map
+VERSION_DEF=${.CURDIR}/../libc/Versions.def
+SYMBOL_MAPS=${.CURDIR}/kse.map
 
 PRECIOUSLIB=
 

Modified: stable/7/lib/libkse/kse.map
==============================================================================
--- stable/7/lib/libkse/kse.map	Wed Jun 10 12:47:54 2009	(r193909)
+++ stable/7/lib/libkse/kse.map	Wed Jun 10 12:51:58 2009	(r193910)
@@ -4,7 +4,6 @@
  * Use the same naming scheme as libc.
  */
 FBSD_1.0 {
-global:
 	__error;
 	accept;
 	aio_suspend;
@@ -158,8 +157,6 @@ global:
 	waitpid;
 	write;
 	writev;
-local:
-	*;
 };
 
 /*
@@ -167,7 +164,6 @@ local:
  * These are not part of our application ABI.
  */
 FBSDprivate_1.0 {
-global:
 	___creat;
 	__accept;
 	__close;
@@ -363,7 +359,4 @@ global:
 	_thread_size_key;
 	_thread_state_running;
 	_thread_state_zoombie;
-
-local:
-	*;
 };