From owner-p4-projects@FreeBSD.ORG  Fri Oct 21 13:45:27 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E241516A421; Fri, 21 Oct 2005 13:45:26 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B96DB16A41F
	for <perforce@freebsd.org>; Fri, 21 Oct 2005 13:45:26 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8210A43D46
	for <perforce@freebsd.org>; Fri, 21 Oct 2005 13:45:26 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9LDjQlf004561
	for <perforce@freebsd.org>; Fri, 21 Oct 2005 13:45:26 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9LDjQVm004558
	for perforce@freebsd.org; Fri, 21 Oct 2005 13:45:26 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Fri, 21 Oct 2005 13:45:26 GMT
Message-Id: <200510211345.j9LDjQVm004558@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-bushman@freebsd.org using -f
From: soc-bushman <soc-bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85642 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2005 13:45:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=85642

Change 85642 by soc-bushman@soc-bushman_stinger on 2005/10/21 13:44:47

	resolve fixed

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/string/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/string/strlen.S#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem.c#4 integrate

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/string/Makefile.inc#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/arm/string/Makefile.inc,v 1.1 2004/05/14 12:04:31 cognet Exp $
+# $FreeBSD: src/lib/libc/arm/string/Makefile.inc,v 1.2 2005/10/03 14:21:49 cognet Exp $
 
 MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S index.c memchr.c memcmp.S memcpy.S \
 	memmove.S memset.S rindex.c strcat.c strchr.c strcmp.S strcpy.c \
-	strlen.c strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c \
+	strlen.S strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c \
 	wmemchr.c

==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc/gen/sem.c,v 1.14 2005/08/20 07:59:13 stefanf Exp $
+ * $FreeBSD: src/lib/libc/gen/sem.c,v 1.15 2005/10/18 17:24:03 stefanf Exp $
  */
 
 /*
@@ -322,7 +322,7 @@
 
 int
 __sem_timedwait(sem_t * __restrict sem,
-    struct timespec * __restrict abs_timeout)
+    const struct timespec * __restrict abs_timeout)
 {
 	if (sem_check_validity(sem) != 0)
 		return (-1);