From: Roland McGrath <roland@gnu.org>
Date: Mon, 8 Jan 1996 22:44:45 +0000 (+0000)
Subject: Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
X-Git-Tag: cvs/libc-960109~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02859f472bec7ec0049d86847f397d1d581488d5;p=thirdparty%2Fglibc.git

Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,
	and cast STREAM to DIR * before passing to readdir and closedir.
---

diff --git a/locale/Makefile b/locale/Makefile
index 7e9475b974b..e4fbe290b13 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ extra-objs	= $(localedef-modules:=.o) $(locale-modules:=.o) \
 localedef-modules	:= charmap locfile-lex locfile-parse locale-ctype \
 			   monetary messages collate numeric
 locale-modules		:= ctypedump
-lib-modules		:= hash xmalloc
+lib-modules		:= locfile-hash xmalloc
 
 
 GPERF = gperf
diff --git a/locale/hash.c b/locale/locfile-hash.c
similarity index 100%
rename from locale/hash.c
rename to locale/locfile-hash.c
diff --git a/posix/glob/ChangeLog b/posix/glob/ChangeLog
index ac27755ce6c..1dd02efc034 100644
--- a/posix/glob/ChangeLog
+++ b/posix/glob/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,
+	and cast STREAM to DIR * before passing to readdir and closedir.
+
 Mon Dec 11 20:07:54 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* posix/glob.c [! STDC_HEADERS]: Declare getenv.