Update.

1998-11-29 1998  H.J. Lu  <hjl@gnu.org>

	* libio/genops.c (_IO_unbuffer_write): Renamed from
	_IO_unbuffer_all.
	(_IO_cleanup): Call _IO_unbuffer_write instead of
	_IO_unbuffer_all.

1998-12-01  Ulrich Drepper  <drepper@cygnus.com>

	* intl/localealias.c: Use *_unlocked version of stdio function if
	_LIBC_REENTRANT is defined, not _LIBC.

1998-12-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* include/grp.h: Add prototypes for internal functions
	__getgrgid_r and __getgrnam_r.

	* inet/herrno.c: Include <netdb.h> for prototype, undef h_errno.

	* resolv/nsap_addr.c: Include <arpa/inet.h> for inet_nsap_addr and
	inet_nsap_ntoa prototypes.

	* sysdeps/unix/sysv/linux/Makefile (syscall-%.h): Pass -I option
	to gcc to have it find the correct system header.
	Patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.

	Reported by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.

9 files changed, 61 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 03419a1a46..e5744a884e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,33 @@
+1998-11-29 1998  H.J. Lu  <hjl@gnu.org>
+
+	* libio/genops.c (_IO_unbuffer_write): Renamed from
+	_IO_unbuffer_all.
+	(_IO_cleanup): Call _IO_unbuffer_write instead of
+	_IO_unbuffer_all.
+
+1998-12-01  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/localealias.c: Use *_unlocked version of stdio function if
+	_LIBC_REENTRANT is defined, not _LIBC.
+
+1998-12-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* include/grp.h: Add prototypes for internal functions
+	__getgrgid_r and __getgrnam_r.
+
+	* inet/herrno.c: Include <netdb.h> for prototype, undef h_errno.
+
+	* resolv/nsap_addr.c: Include <arpa/inet.h> for inet_nsap_addr and
+	inet_nsap_ntoa prototypes.
+
 1998-12-01  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/unix/sysv/linux/Makefile (syscall-%.h): Pass -I option
+	to gcc to have it find the correct system header.
+	Patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.
+
 	* Makefile (postclean): Add sysd-sorted.
+	Reported by Maciej W. Rozycki <macro@ds2.pg.gda.pl>.
 
 1998-12-01  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 
diff --git a/include/grp.h b/include/grp.h
index 14be78cf00..87f6a7bec2 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -7,4 +7,14 @@ extern int __getgrent_r __P ((struct group *__resultbuf, char *buffer,
 extern int __fgetgrent_r __P ((FILE * __stream, struct group *__resultbuf,
 			       char *buffer, size_t __buflen,
 			       struct group **__result));
+
+/* Search for an entry with a matching group ID.  */
+extern int __getgrgid_r __P ((__gid_t __gid, struct group *__resultbuf,
+			      char *__buffer, size_t __buflen,
+			      struct group **__result));
+
+/* Search for an entry with a matching group name.  */
+extern int __getgrnam_r __P ((__const char *__name, struct group *__resultbuf,
+			      char *__buffer, size_t __buflen,
+			      struct group **__result));
 #endif
diff --git a/inet/herrno.c b/inet/herrno.c
index 4eac42ed46..c11c58baf9 100644
--- a/inet/herrno.c
+++ b/inet/herrno.c
@@ -17,6 +17,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <features.h>
+#include <netdb.h>
+#undef h_errno
 
 /* We need to have the error status variable of the resolver
    accessible in the libc.  */
diff --git a/intl/localealias.c b/intl/localealias.c
index 78a704f185..0c35b7a551 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -133,11 +133,11 @@ struct block_list
 # define alloca(size) (malloc (size))
 #endif	/* have alloca */
 
-#if defined _LIBC || defined HAVE_FGETS_UNLOCKED
+#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
 # undef fgets
 # define fgets(buf, len, s) fgets_unlocked (buf, len, s)
 #endif
-#if defined _LIBC || defined HAVE_FEOF_UNLOCKED
+#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
 # undef feof
 # define feof(s) feof_unlocked (s)
 #endif
diff --git a/libio/genops.c b/libio/genops.c
index 6f560dec53..30bceb6274 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -705,14 +705,16 @@ _IO_flush_all_linebuffered ()
       _IO_OVERFLOW (fp, EOF);
 }
 
-static void _IO_unbuffer_all __P ((void));
+static void _IO_unbuffer_write __P ((void));
 
 static void
-_IO_unbuffer_all ()
+_IO_unbuffer_write ()
 {
   _IO_FILE *fp;
   for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
-    if (! (fp->_flags & _IO_UNBUFFERED))
+    if (! (fp->_flags & _IO_UNBUFFERED)
+	&& (! (fp->_flags & _IO_NO_WRITES)
+	    || (fp->_flags & _IO_IS_APPENDING)))
       _IO_SETBUF (fp, NULL, 0);
 }
 
@@ -728,7 +730,7 @@ _IO_cleanup ()
 
      The following will make the standard streambufs be unbuffered,
      which forces any output from late destructors to be written out. */
-  _IO_unbuffer_all ();
+  _IO_unbuffer_write ();
 
   return result;
 }
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 32b0159701..92c4492692 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* wrapsyscall.c: Include <sys/mman.h> for msync,
+	<stdlib.h> for system and <termios.h> for tcdrain prototype.
+	Correct msync declaration.
+
 1998-11-29  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* sysdeps/pthread/bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_get,
diff --git a/linuxthreads/wrapsyscall.c b/linuxthreads/wrapsyscall.c
index 4659692d56..d55e6cca61 100644
--- a/linuxthreads/wrapsyscall.c
+++ b/linuxthreads/wrapsyscall.c
@@ -1,5 +1,5 @@
 /* Wrapper arpund system calls to provide cancelation points.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -19,10 +19,13 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <fcntl.h>
+#include <sys/mman.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdlib.h>
+#include <termios.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -87,8 +90,8 @@ strong_alias (lseek, __lseek)
 
 
 /* msync(2).  */
-CANCELABLE_SYSCALL (int, msync, (const void *start, size_t length, int flags),
-		    (start, length, flags))
+CANCELABLE_SYSCALL (int, msync, (__ptr_t addr, size_t length, int flags),
+		    (addr, length, flags))
 
 
 /* nanosleep(2).  */
diff --git a/resolv/nsap_addr.c b/resolv/nsap_addr.c
index 5157c37c14..2222cda75a 100644
--- a/resolv/nsap_addr.c
+++ b/resolv/nsap_addr.c
@@ -23,6 +23,7 @@ static char rcsid[] = "$Id$";
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <ctype.h>
 #include <resolv.h>
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 4cd3a22309..ac99436a8d 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -33,7 +33,7 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscal
 	 echo ''; \
 	 SUNPRO_DEPENDENCIES='$(@:.h=.d) $(patsubst $(objpfx)%,$$(objpfx)%,\
 						    $(@:.d=.h) $(@:.h=.d))' \
-	 $(CC) -E -x c $< -D_LIBC -dM | \
+	 $(CC) -E -x c $(sysincludes) $< -D_LIBC -dM | \
 	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p'; \
 	} > $(@:.d=.h).new
 	mv -f $(@:.d=.h).new $(@:.d=.h)