[Emacs-diffs] /srv/bzr/emacs/trunk r109017: Move GNU_LIBRARY_PENDING_OUTPUT_COUNT from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109017
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 23:52:48 -0700
message:
  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.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/gnu-linux.h
  src/s/gnu.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-11 06:09:09 +0000
+++ b/ChangeLog 2012-07-11 06:52:48 +0000
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <address@hidden>
+
+       * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT):
+       Move here from src/s.
+
 2012-07-11  Paul Eggert  <address@hidden>
 
        Assume rename, strerror.

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-11 06:09:09 +0000
+++ b/configure.ac      2012-07-11 06:52:48 +0000
@@ -3163,6 +3163,70 @@
 AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
   [Name of the default sound device.])
 
+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([[
+#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)
+
+      if test $emacs_pending_output = unknown; then
+        case $opsys in
+          gnu-linux | gnu-kfreebsd)
+            AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+#ifndef __UCLIBC__
+# error "not using uclibc"
+#endif
+            ]], [[]])], emacs_pending_output=uclibc, emacs_pending_output=old)
+            ;;
+        esac
+      fi
+
+      AC_MSG_RESULT([$emacs_pending_output])
+
+      case $emacs_pending_output in
+        new)
+          dnl New C libio names.
+          AC_DEFINE(GNU_LIBRARY_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),
+            [((FILE)->__bufpos - (FILE)->__bufstart)])
+          ;;
+        old)
+          dnl Old C++ iostream names.
+          AC_DEFINE(GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE),
+            [((FILE)->_pptr - (FILE)->_pbase)])
+          ;;
+      esac
+    ;;
+esac
+
+
 dnl Used in vm-limit.c
 AH_TEMPLATE(DATA_START, [Address of the start of the data segment.])
 dnl Used in lisp.h, emacs.c, mem-limits.h
@@ -3172,19 +3236,7 @@
 stored in a Lisp_Object.])
 dnl if Emacs uses fewer than 32 bits for the value field of a LISP_OBJECT.
 
-dnl Used in dispnew.c
-AH_TEMPLATE(PENDING_OUTPUT_COUNT, [Number of chars of output in the
-buffer of a stdio stream.])
-
 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)
     dnl libc defines data_start.
     AC_DEFINE(DATA_START, [({ extern int data_start; (char *) &data_start; })])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 06:14:27 +0000
+++ b/src/ChangeLog     2012-07-11 06:52:48 +0000
@@ -1,3 +1,8 @@
+2012-07-11  Glenn Morris  <address@hidden>
+
+       * s/gnu.h, s/gnu-linux.h:
+       Move GNU_LIBRARY_PENDING_OUTPUT_COUNT to configure.
+
 2012-07-11  John Wiegley  <address@hidden>
 
        * alloc.c (mark_memory): Guard the "no_address_safety_analysis"

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-10 21:48:34 +0000
+++ b/src/s/gnu-linux.h 2012-07-11 06:52:48 +0000
@@ -92,25 +92,9 @@
    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 */
 

=== modified file 'src/s/gnu.h'
--- a/src/s/gnu.h       2012-07-10 07:15:05 +0000
+++ b/src/s/gnu.h       2012-07-11 06:52:48 +0000
@@ -20,13 +20,3 @@
 
 /* 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 */