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

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 0a7b7de1d..edf737800 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,23 +1,40 @@
-#serial 1
+#serial 8
+
+# Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 dnl From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert
 dnl and Ulrich Drepper.
 
-AC_DEFUN(jm_FUNC_FPENDING,
+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([gl_FUNC_FPENDING],
 [
+  AC_LIBSOURCES([__fpending.c, __fpending.h])
+
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
+  fp_headers='
+#     include <stdio.h>
+#     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],
 		   ac_cv_sys_pending_output_n_bytes,
       [
-        fp_save_DEFS=$DEFS
 	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'				\
@@ -26,7 +43,7 @@ AC_DEFUN(jm_FUNC_FPENDING,
 	    'fp->_p - fp->_bf._base'				\
 								\
 	    '# SCO, Unixware'					\
-	    'fp->__ptr - fp->__base'				\
+	    '(fp->__ptr ? fp->__ptr - fp->__base : 0)'		\
 								\
 	    '# old glibc?'					\
 	    'fp->__bufp - fp->__buffer'				\
@@ -44,14 +61,12 @@ AC_DEFUN(jm_FUNC_FPENDING,
 	  # Skip each embedded comment.
 	  case "$ac_expr" in '#'*) continue;; esac
 
-	  DEFS="$DEFS -DPENDING_OUTPUT_N_BYTES=$ac_expr"
 	  AC_TRY_COMPILE(
 	    [#include <stdio.h>
 	    ],
 	    [FILE *fp = stdin; (void) ($ac_expr);],
 	    fp_done=yes
 	  )
-	  DEFS=$fp_save_DEFS
 	  test "$fp_done" = yes && break
 	done