X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffpending.m4;h=09ae7e3febe6c7c4058b829a220267bda12d9371;hb=91fd3b18b755b77c4bb3f7556ddedb055c16c834;hp=87398b142b4ba5e9ccccfd631ecac62be355c8de;hpb=62a39c7d945eb4160c206242b85c624fb2fb21fd;p=gnulib.git diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 87398b142..09ae7e3fe 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ -#serial 6 +# serial 15 -# Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2010 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. @@ -15,11 +15,10 @@ 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]) + AC_CHECK_HEADERS_ONCE([stdio_ext.h]) + AC_CHECK_FUNCS_ONCE([__fpending]) fp_headers=' +# include # if HAVE_STDIO_EXT_H # include # endif @@ -27,53 +26,58 @@ AC_DEFUN([gl_FUNC_FPENDING], 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, + [how to determine the number of pending output bytes on a stream], + ac_cv_sys_pending_output_n_bytes, [ - for ac_expr in \ - \ - '# glibc2' \ - 'fp->_IO_write_ptr - fp->_IO_write_base' \ - \ - '# traditional Unix' \ - 'fp->_ptr - fp->_base' \ - \ - '# BSD' \ - 'fp->_p - fp->_bf._base' \ - \ - '# SCO, Unixware' \ - 'fp->__ptr - fp->__base' \ - \ - '# old glibc?' \ - 'fp->__bufp - fp->__buffer' \ - \ - '# old glibc iostream?' \ - 'fp->_pptr - fp->_pbase' \ - \ - '# VMS' \ - '(*fp)->_ptr - (*fp)->_base' \ - \ - '# e.g., DGUX R4.11; the info is not available' \ - 1 \ - ; do + for ac_expr in \ + \ + '# glibc2' \ + 'fp->_IO_write_ptr - fp->_IO_write_base' \ + \ + '# traditional Unix' \ + 'fp->_ptr - fp->_base' \ + \ + '# BSD' \ + 'fp->_p - fp->_bf._base' \ + \ + '# SCO, Unixware' \ + '(fp->__ptr ? fp->__ptr - fp->__base : 0)' \ + \ + '# QNX' \ + '(fp->_Mode & 0x2000 /*_MWRITE*/ ? fp->_Next - fp->_Buf : 0)' \ + \ + '# old glibc?' \ + 'fp->__bufp - fp->__buffer' \ + \ + '# old glibc iostream?' \ + 'fp->_pptr - fp->_pbase' \ + \ + '# emx+gcc' \ + 'fp->_ptr - fp->_buffer' \ + \ + '# VMS' \ + '(*fp)->_ptr - (*fp)->_base' \ + \ + '# e.g., DGUX R4.11; the info is not available' \ + 1 \ + ; do - # Skip each embedded comment. - case "$ac_expr" in '#'*) continue;; esac + # Skip each embedded comment. + case "$ac_expr" in '#'*) continue;; esac - AC_TRY_COMPILE( - [#include - ], - [FILE *fp = stdin; (void) ($ac_expr);], - fp_done=yes - ) - test "$fp_done" = yes && break - done + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[FILE *fp = stdin; (void) ($ac_expr);]])], + [fp_done=yes] + ) + test "$fp_done" = yes && break + done - ac_cv_sys_pending_output_n_bytes=$ac_expr + ac_cv_sys_pending_output_n_bytes=$ac_expr ] ) - AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES, + AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES], $ac_cv_sys_pending_output_n_bytes, [the number of pending output bytes on stream `fp']) + AC_LIBOBJ([fpending]) fi ])