[Emacs-diffs] /srv/bzr/emacs/trunk r109475: Remove GNU_LIBRARY_PENDING_OUTPUT_COUNT

[Glenn Morris]

------------------------------------------------------------
revno: 109475
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 16:22:22 -0400
message:
  Remove GNU_LIBRARY_PENDING_OUTPUT_COUNT
  
  * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.
  (PENDING_OUTPUT_COUNT): Absorb GNU_LIBRARY_PENDING_OUTPUT_COUNT.
  (DISPNEW_NEEDS_STDIO_EXT): New define.
  
  * src/dispnew.c (GNU_LIBRARY_PENDING_OUTPUT_COUNT, PENDING_OUTPUT_COUNT):
  Let configure handle it.
  (stdio_ext.h) [DISPNEW_NEEDS_STDIO_EXT]: Include it.
  
  * nt/config.nt (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.
  (PENDING_OUTPUT_COUNT): Define it as dispnew.c used to.
  
  * admin/CPP-DEFINES (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.
modified:
  ChangeLog
  admin/CPP-DEFINES
  configure.ac
  nt/ChangeLog
  nt/config.nt
  src/ChangeLog
  src/dispnew.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-05 12:53:48 +0000
+++ b/ChangeLog 2012-08-06 20:22:22 +0000
@@ -1,3 +1,9 @@
+2012-08-06  Glenn Morris  <address@hidden>
+
+       * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.
+       (PENDING_OUTPUT_COUNT): Absorb GNU_LIBRARY_PENDING_OUTPUT_COUNT.
+       (DISPNEW_NEEDS_STDIO_EXT): New define.
+
 2012-08-05  Michael Albinus  <address@hidden>
 
        * INSTALL: Explain, how to disable D-Bus at all.  (Bug#12112)

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2012-08-02 06:47:17 +0000
+++ b/admin/CPP-DEFINES 2012-08-06 20:22:22 +0000
@@ -112,7 +112,6 @@
 GC_MARK_STACK
 GC_SETJMP_WORKS
 GMALLOC_INHIBIT_VALLOC
-GNU_LIBRARY_PENDING_OUTPUT_COUNT
 GNU_MALLOC
 HAVE_AIX_SMT_EXP
 HAVE_CBRT

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-05 05:00:52 +0000
+++ b/configure.ac      2012-08-06 20:22:22 +0000
@@ -3506,31 +3506,32 @@
 
 dnl Used in dispnew.c
 AH_TEMPLATE(PENDING_OUTPUT_COUNT, [Number of chars of output in the
-buffer of a stdio stream.])
-
-dnl FIXME just PENDING_OUTPUT_COUNT should suffice.
-AH_TEMPLATE(GNU_LIBRARY_PENDING_OUTPUT_COUNT, [Value of
-PENDING_OUTPUT_COUNT if using the GNU C library.])
-
-case $opsys in
-  cygwin | darwin | freebsd | netbsd | openbsd )
-    AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)])
-    ;;
-
-  unixware)
-    AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)])
-    ;;
-
-  gnu | gnu-linux | gnu-kfreebsd )
-    AC_MSG_CHECKING([for style of pending output formalism])
-    dnl In autoconf 2.67 and later, we could use a single test
-    dnl since the preprocessed output is accessible in "conftest.i".
-    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+  buffer of a stdio stream.])
+
+AC_MSG_CHECKING([whether we are using the GNU C library])
+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include <features.h>
+#ifndef __GNU_LIBRARY__
+# error "this is not the GNU C library"
+#endif
+  ]], [[]])], emacs_glibc=yes, emacs_glibc=no)
+AC_MSG_RESULT([$emacs_glibc])
+
+if test $emacs_glibc = yes; then
+
+  emacs_pending_output=unknown
+
+  case $opsys in
+    gnu | gnu-linux | gnu-kfreebsd )
+      AC_MSG_CHECKING([for style of pending output formalism])
+      dnl In autoconf 2.67 and later, we could use a single test
+      dnl since the preprocessed output is accessible in "conftest.i".
+      AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #if !defined (_IO_STDIO_H) && !defined (_STDIO_USES_IOSTREAM)
 # error "stdio definitions not found"
 #endif
-      ]], [[]])], emacs_pending_output=new, emacs_pending_output=unknown)
+        ]], [[]])], emacs_pending_output=new, [])
 
       if test $emacs_pending_output = unknown; then
         case $opsys in
@@ -3550,22 +3551,51 @@
       case $emacs_pending_output in
         new)
           dnl New C libio names.
-          AC_DEFINE(GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE),
+          AC_DEFINE(PENDING_OUTPUT_COUNT(FILE),
             [((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)])
           ;;
         uclibc)
           dnl Using the uClibc library.
-          AC_DEFINE(GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE),
+          AC_DEFINE(PENDING_OUTPUT_COUNT(FILE),
             [((FILE)->__bufpos - (FILE)->__bufstart)])
           ;;
         old)
           dnl Old C++ iostream names.
-          AC_DEFINE(GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE),
+          AC_DEFINE(PENDING_OUTPUT_COUNT(FILE),
             [((FILE)->_pptr - (FILE)->_pbase)])
           ;;
       esac
     ;;
-esac
+  esac                          dnl opsys
+
+  if test $emacs_pending_output = unknown; then
+    AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__bufp - 
(FILE)->__buffer)])
+  fi
+
+else                            dnl !emacs_glibc
+
+  case $opsys in
+    cygwin | darwin | freebsd | netbsd | openbsd )
+      AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)])
+      ;;
+
+    unixware)
+      AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)])
+      ;;
+
+    *)
+      dnl HAVE_STDIO_EXT_H && HAVE___FPENDING
+      if test x$ac_cv_header_stdio_ext_h = xyes && \
+        test x$ac_cv_func___fpending = xyes; then
+        AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [__fpending (FILE)])
+        AC_DEFINE(DISPNEW_NEEDS_STDIO_EXT, 1,
+          [Define if dispnew.c should include stdio_ext.h.])
+      else
+        AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_ptr - (FILE)->_base)])
+      fi
+      ;;
+  esac
+fi                              dnl emacs_glibc
 
 
 dnl Used in vm-limit.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-08-04 14:17:10 +0000
+++ b/nt/ChangeLog      2012-08-06 20:22:22 +0000
@@ -1,3 +1,8 @@
+2012-08-06  Glenn Morris  <address@hidden>
+
+       * config.nt (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.
+       (PENDING_OUTPUT_COUNT): Define it as dispnew.c used to.
+
 2012-08-04  Eli Zaretskii  <address@hidden>
 
        * paths.h (PATH_LOADSEARCH, PATH_SITELOADSEARCH, PATH_EXEC)

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-08-03 12:16:40 +0000
+++ b/nt/config.nt      2012-08-06 20:22:22 +0000
@@ -211,9 +211,6 @@
    whether the gnulib module scanf shall be considered present. */
 #undef GNULIB_SCANF
 
-/* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */
-#undef GNU_LIBRARY_PENDING_OUTPUT_COUNT
-
 /* Define if ths system is compatible with GNU/Linux. */
 #undef GNU_LINUX
 
@@ -1229,7 +1226,11 @@
 #undef PACKAGE_VERSION
 
 /* Number of chars of output in the buffer of a stdio stream. */
-#undef PENDING_OUTPUT_COUNT
+#ifdef __GNU_LIBRARY__
+#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer)
+#else
+#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
+#endif
 
 /* Define to empty to suppress deprecation warnings when building with
    --enable-gcc-warnings and with libpng versions before 1.5, which lack

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-06 16:55:46 +0000
+++ b/src/ChangeLog     2012-08-06 20:22:22 +0000
@@ -1,3 +1,9 @@
+2012-08-06  Glenn Morris  <address@hidden>
+
+       * dispnew.c (GNU_LIBRARY_PENDING_OUTPUT_COUNT, PENDING_OUTPUT_COUNT):
+       Let configure handle it.
+       (stdio_ext.h) [DISPNEW_NEEDS_STDIO_EXT]: Include it.
+
 2012-08-06  Dmitry Antipov  <address@hidden>
 
        Use GCALIGNMENT where appropriate.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2012-08-06 10:24:26 +0000
+++ b/src/dispnew.c     2012-08-06 20:22:22 +0000
@@ -65,33 +65,10 @@
 #include "systime.h"
 #include <errno.h>
 
-/* Get number of chars of output now in the buffer of a stdio stream.
-   This ought to be built in stdio, but it isn't.  Some s- files
-   override this because their stdio internals differ.  */
-#ifdef __GNU_LIBRARY__
-
-/* The s- file might have overridden the definition with one that
-   works for the system's C library.  But we are using the GNU C
-   library, so this is the right definition for every system.  */
-#ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT
-#define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT
-#else
-#undef PENDING_OUTPUT_COUNT
-#define        PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer)
-#endif
-
-/* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined  */
-#elif !defined (PENDING_OUTPUT_COUNT)
-
-#if HAVE_STDIO_EXT_H && HAVE___FPENDING
+#ifdef DISPNEW_NEEDS_STDIO_EXT
 #include <stdio_ext.h>
-#define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)
-#else
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
 #endif
 
-#endif /* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined */
-
 #if defined (HAVE_TERM_H) && defined (GNU_LINUX)
 #include <term.h>              /* for tgetent */
 #endif