From: Roland McGrath <roland@redhat.com>
Date: Thu, 14 Dec 1995 11:14:36 +0000 (+0000)
Subject: Updated from libc
X-Git-Tag: 3.74.2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a89eb210840d50825bde622ecd521aab857d2cdc;p=platform%2Fupstream%2Fmake.git

Updated from libc
---

diff --git a/glob/ChangeLog b/glob/ChangeLog
index ac27755..1dd02ef 100644
--- a/glob/ChangeLog
+++ b/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.
diff --git a/glob/glob.c b/glob/glob.c
index e212576..954960c 100644
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -668,7 +668,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 
       stream = ((flags & GLOB_ALTDIRFUNC) ?
 		(*pglob->gl_opendir) (directory) :
-		opendir (directory));
+		(__ptr_t) opendir (directory));
       if (stream == NULL)
 	{
 	  if ((errfunc != NULL && (*errfunc) (directory, errno)) ||
@@ -682,7 +682,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 	    size_t len;
 	    struct dirent *d = ((flags & GLOB_ALTDIRFUNC) ?
 				(*pglob->gl_readdir) (stream) :
-				readdir (stream));
+				readdir ((DIR *) stream));
 	    if (d == NULL)
 	      break;
 	    if (! REAL_DIR_ENTRY (d))
@@ -757,7 +757,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
       if (flags & GLOB_ALTDIRFUNC)
 	(*pglob->gl_closedir) (stream);
       else
-	closedir (stream);
+	closedir ((DIR *) stream);
       errno = save;
     }
   return nfound == 0 ? GLOB_NOMATCH : 0;
@@ -768,7 +768,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
     if (flags & GLOB_ALTDIRFUNC)
       (*pglob->gl_closedir) (stream);
     else
-      closedir (stream);
+      closedir ((DIR *) stream);
     errno = save;
   }
   while (names != NULL)