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.

Wed Dec 13 22:06:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* hurd/hurdsig.c (_hurd_internal_post_signal: suspend): Reply
	after aborting RPCs but before calling proc_mark_stop.

diff --git a/ChangeLog b/ChangeLog
index ceb34e1..35559b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
+Wed Dec 13 22:06:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * hurd/hurdsig.c (_hurd_internal_post_signal: suspend): Reply
+       after aborting RPCs but before calling proc_mark_stop.
+
 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/posix/glob.c b/posix/glob.c
index e212576..954960c 100644 (file)
--- a/posix/glob.c
+++ b/posix/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)