[Emacs-diffs] /srv/bzr/emacs/trunk r109002: * dispnew.c (PENDING_OUTPUT_COUNT) [!__GNU_LIBRARY__]: Clarify fallback case.

[Glenn Morris]

------------------------------------------------------------
revno: 109002
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 15:04:14 -0400
message:
  * dispnew.c (PENDING_OUTPUT_COUNT) [!__GNU_LIBRARY__]: Clarify fallback case.
modified:
  src/ChangeLog
  src/dispnew.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-10 16:53:26 +0000
+++ b/src/ChangeLog     2012-07-10 19:04:14 +0000
@@ -1,3 +1,8 @@
+2012-07-10  Glenn Morris  <address@hidden>
+
+       * dispnew.c (PENDING_OUTPUT_COUNT) [!__GNU_LIBRARY__]:
+       Clarify fallback case.
+
 2012-07-10  Dmitry Antipov  <address@hidden>
 
        Use XCAR and XCDR instead of Fcar and Fcdr where possible.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2012-07-05 18:35:48 +0000
+++ b/src/dispnew.c     2012-07-10 19:04:14 +0000
@@ -65,28 +65,29 @@
 /* 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
-#else /* not __GNU_LIBRARY__ */
-#if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING
+
+/* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined  */
+#elif !defined (PENDING_OUTPUT_COUNT)
+
+#if HAVE_STDIO_EXT_H && HAVE___FPENDING
 #include <stdio_ext.h>
 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)
-#endif
-#ifndef PENDING_OUTPUT_COUNT
+#else
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
 #endif
-#endif /* not __GNU_LIBRARY__ */
+
+#endif /* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined */
 
 #if defined (HAVE_TERM_H) && defined (GNU_LINUX)
 #include <term.h>              /* for tgetent */