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

[Glenn Morris]

------------------------------------------------------------
revno: 108991
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 00:37:17 -0700
message:
  Move PENDING_OUTPUT_COUNT from src/s to configure
  
  * configure.ac (PENDING_OUTPUT_COUNT): Move here from src/s.
  
  * src/s/cygwin.h, src/s/darwin.h, src/s/freebsd.h, src/s/netbsd.h:
  * src/s/unixware.h: Move PENDING_OUTPUT_COUNT definition to configure.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/cygwin.h
  src/s/darwin.h
  src/s/freebsd.h
  src/s/netbsd.h
  src/s/unixware.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-10 07:15:05 +0000
+++ b/ChangeLog 2012-07-10 07:37:17 +0000
@@ -1,6 +1,7 @@
 2012-07-10  Glenn Morris  <address@hidden>
 
-       * configure.ac (DATA_START, DATA_SEG_BITS): Move here from src/s.
+       * configure.ac (DATA_START, DATA_SEG_BITS, PENDING_OUTPUT_COUNT):
+       Move here from src/s.
 
 2012-07-09  Andreas Schwab  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-10 07:15:05 +0000
+++ b/configure.ac      2012-07-10 07:37:17 +0000
@@ -3154,7 +3154,19 @@
 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-10 07:15:05 +0000
+++ b/src/ChangeLog     2012-07-10 07:37:17 +0000
@@ -11,6 +11,9 @@
 
 2012-07-10  Glenn Morris  <address@hidden>
 
+       * s/cygwin.h, s/darwin.h, s/freebsd.h, s/netbsd.h, s/unixware.h:
+       Move PENDING_OUTPUT_COUNT definition to configure.
+
        * s/irix6-5.h (DATA_START, DATA_SEG_BITS):
        * s/hpux10-20.h (DATA_SEG_BITS, DATA_START):
        * s/gnu.h (DATA_START): Move definitions to configure.

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2012-06-11 23:17:11 +0000
+++ b/src/s/cygwin.h    2012-07-10 07:37:17 +0000
@@ -74,8 +74,6 @@
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 #define HAVE_SOCKETS
 
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls

=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h    2012-07-07 01:03:46 +0000
+++ b/src/s/darwin.h    2012-07-10 07:37:17 +0000
@@ -92,9 +92,6 @@
    also the name of a Mach system call.  */
 #define init_process emacs_init_process
 
-/* Used in dispnew.c.  Copied from freebsd.h. */
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 /* System uses OXTABS instead of the expected TAB3.  (Copied from bsd386.h.)  
*/
 #define TAB3 OXTABS
 

=== modified file 'src/s/freebsd.h'
--- a/src/s/freebsd.h   2012-04-14 06:18:49 +0000
+++ b/src/s/freebsd.h   2012-07-10 07:37:17 +0000
@@ -23,8 +23,6 @@
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 /* This silences a few compilation warnings.  */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2012-04-14 06:18:49 +0000
+++ b/src/s/netbsd.h    2012-07-10 07:37:17 +0000
@@ -21,8 +21,6 @@
 /* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
 #define DEFAULT_SOUND_DEVICE "/dev/audio"
 
 /* Greg A. Woods <address@hidden> says we must include signal.h

=== modified file 'src/s/unixware.h'
--- a/src/s/unixware.h  2012-07-07 01:03:46 +0000
+++ b/src/s/unixware.h  2012-07-10 07:37:17 +0000
@@ -44,8 +44,6 @@
     pty_name[sizeof(pty_name) - 1] = 0;                \
   }
 
-#define        PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE