X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffpending.m4;h=a6e4338dda292385bfe6af37763c04281a8291ff;hb=55b0159d96e14497b31118b9db52f3e4546b26b0;hp=0a7b7de1dc93190a1ec006af28f04f268ed670db;hpb=2209966c10df105267c6cd8f2c5087107098606f;p=gnulib.git

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 0a7b7de1d..a6e4338dd 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -4,10 +4,20 @@ dnl From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert
 dnl and Ulrich Drepper.
 
+dnl Find out how to determine the number of pending output bytes on a stream.
+dnl glibc (2.1.93 and newer) and Solaris provide __fpending.  On other systems,
+dnl we have to grub around in the FILE struct.
+
 AC_DEFUN(jm_FUNC_FPENDING,
 [
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
+  fp_headers='
+#     if HAVE_STDIO_EXT_H
+#      include <stdio_ext.h>
+#     endif
+'
+  AC_CHECK_DECLS([__fpending], , , $fp_headers)
   if test $ac_cv_func___fpending = no; then
     AC_CACHE_CHECK(
 	      [how to determine the number of pending output bytes on a stream],
@@ -17,7 +27,7 @@ AC_DEFUN(jm_FUNC_FPENDING,
 	for ac_expr in						\
 								\
 	    '# glibc2'						\
-	    'fp->_IO_write_ptr - fp->_IO_write_x_base'		\
+	    'fp->_IO_write_ptr - fp->_IO_write_base'		\
 								\
 	    '# traditional Unix'				\
 	    'fp->_ptr - fp->_base'				\