PERFORCE change 85642 for review

[soc-bushman]

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

Change 85642 by soc-bushman at 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);