Move GNU_LIBRARY_PENDING_OUTPUT_COUNT from src/s to configure

* configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Move here from src/s.

* src/s/gnu.h, src/s/gnu-linux.h:
Move GNU_LIBRARY_PENDING_OUTPUT_COUNT to configure.

3 files changed, 6 insertions, 27 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 64a7989a70f..045a3d374b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <rgm@gnu.org>
+
+        * s/gnu.h, s/gnu-linux.h:
+        Move GNU_LIBRARY_PENDING_OUTPUT_COUNT to configure.
+
 2012-07-11  John Wiegley  <johnw@newartisans.com>
 
         * alloc.c (mark_memory): Guard the "no_address_safety_analysis"
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 6f45ee00b78..9f8a994bb7e 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -92,25 +92,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 
-/* This is needed for dispnew.c:update_frame.  */
 #ifdef emacs
-#include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
-/* New C libio names.  */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
-  ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
-#elif defined (__UCLIBC__)
-/* Using the uClibc library.  */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
-  ((FILE)->__bufpos - (FILE)->__bufstart)
-#else /* !_IO_STDIO_H && ! __UCLIBC__ */
-/* Old C++ iostream names.  */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
-  ((FILE)->_pptr - (FILE)->_pbase)
-#endif /* !_IO_STDIO_H && ! __UCLIBC__ */
-
 #define INTERRUPT_INPUT
-#endif /* emacs */
+#endif
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index bac233266c8..9ec75081ca1 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -20,13 +20,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"
-
-/* It would be harmless to drop the ifdef emacs test.  */
-#ifdef emacs
-#include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
-/* new C libio names */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
-  ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
-#endif /* !_IO_STDIO_H */
-#endif /* emacs */