From owner-p4-projects@FreeBSD.ORG  Sun Feb 12 03:43:28 2006
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 ED1A716A423; Sun, 12 Feb 2006 03:43:27 +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 A944716A420
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 03:43:27 +0000 (GMT)
	(envelope-from jkoshy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7561D43D45
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 03:43:27 +0000 (GMT)
	(envelope-from jkoshy@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 k1C3hRAn027907
	for <perforce@freebsd.org>; Sun, 12 Feb 2006 03:43:27 GMT
	(envelope-from jkoshy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1C3hRqV027904
	for perforce@freebsd.org; Sun, 12 Feb 2006 03:43:27 GMT
	(envelope-from jkoshy@freebsd.org)
Date: Sun, 12 Feb 2006 03:43:27 GMT
Message-Id: <200602120343.k1C3hRqV027904@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jkoshy@freebsd.org using -f
From: Joseph Koshy <jkoshy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91605 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: Sun, 12 Feb 2006 03:43:28 -0000

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

Change 91605 by jkoshy@jkoshy_orthanc_mips on 2006/02/12 03:43:02

	Unbreak `make _libraries'.

Affected files ...

.. //depot/projects/mips/libexec/rtld-aout/shlib.c#2 integrate
.. //depot/projects/mips/libexec/rtld-aout/shlib.h#2 integrate

Differences ...

==== //depot/projects/mips/libexec/rtld-aout/shlib.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.23 2002/09/17 01:48:53 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $
  */
 
 #include <sys/param.h>
@@ -62,14 +62,13 @@
 char	 **search_dirs;
 int	n_search_dirs;
 
-char	*standard_search_dirs[] = {
+const char	*standard_search_dirs[] = {
 	STANDARD_SEARCH_DIRS
 };
 
 
 void
-add_search_dir(name)
-	char	*name;
+add_search_dir(const char *name)
 {
 	int n;
 
@@ -269,7 +268,7 @@
 	int		*minorp;
 	int		do_dot_a;
 {
-	int		namelen;
+	size_t		namelen;
 	DIR		*dd;
 	struct dirent	*dp;
 	int		best_dewey[MAXDEWEY];

==== //depot/projects/mips/libexec/rtld-aout/shlib.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $
  */
 
 /*
@@ -33,7 +33,7 @@
 extern char	**search_dirs;
 extern int	n_search_dirs;
 
-void	add_search_dir __P((char *));
+void	add_search_dir __P((const char *));
 void	add_search_path __P((char *));
 void	std_search_path __P((void));
 int	getdewey __P((int[], char *));