Make it possible to compile setenv.c separately, unconditionally.

[gnulib.git] / m4 / fpending.m4

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index d086ac6..a073483 100644 (file)
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,9 @@
-#serial 4
+#serial 10
+
+# 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 From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert


@@ -10,9 +15,10 @@ dnl we have to grub around in the FILE struct.
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [

-  AC_CHECK_HEADERS(stdio_ext.h)
+  AC_CHECK_HEADERS_ONCE(stdio_ext.h)

   AC_REPLACE_FUNCS([__fpending])
   fp_headers='
   AC_REPLACE_FUNCS([__fpending])
   fp_headers='

+#     include <stdio.h>

 #     if HAVE_STDIO_EXT_H
 #      include <stdio_ext.h>
 #     endif
 #     if HAVE_STDIO_EXT_H
 #      include <stdio_ext.h>
 #     endif


@@ -35,7 +41,7 @@ AC_DEFUN([gl_FUNC_FPENDING],
            'fp->_p - fp->_bf._base'                            \
                                                                \
            '# SCO, Unixware'                                   \
            'fp->_p - fp->_bf._base'                            \
                                                                \
            '# SCO, Unixware'                                   \

-           'fp->__ptr - fp->__base'                            \
+           '(fp->__ptr ? fp->__ptr - fp->__base : 0)'          \

                                                                \
            '# old glibc?'                                      \
            'fp->__bufp - fp->__buffer'                         \
                                                                \
            '# old glibc?'                                      \
            'fp->__bufp - fp->__buffer'                         \