From d02eb359e68a083fc55f0355b86df2a07b8d570d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jul 2012 00:37:17 -0700 Subject: [PATCH] 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. --- ChangeLog | 3 ++- configure.ac | 12 ++++++++++++ src/ChangeLog | 3 +++ src/s/cygwin.h | 2 -- src/s/darwin.h | 3 --- src/s/freebsd.h | 2 -- src/s/netbsd.h | 2 -- src/s/unixware.h | 2 -- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4504739928..e3b546d32f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2012-07-10 Glenn Morris - * 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 diff --git a/configure.ac b/configure.ac index 20b149f58e..028706af8e 100644 --- a/configure.ac +++ b/configure.ac @@ -3154,7 +3154,19 @@ AH_TEMPLATE(DATA_SEG_BITS, [Extra bits to be or'd in with any pointers 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; })]) diff --git a/src/ChangeLog b/src/ChangeLog index cbfc1245c1..de0f729f91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -11,6 +11,9 @@ 2012-07-10 Glenn Morris + * 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. diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 9b43734132..0bbdab0cca 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -74,8 +74,6 @@ along with GNU Emacs. If not, see . */ /* 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 diff --git a/src/s/darwin.h b/src/s/darwin.h index b042630ee9..6b3e680c5d 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -92,9 +92,6 @@ along with GNU Emacs. If not, see . */ 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 diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 05be07695c..04e9a19bdf 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -23,8 +23,6 @@ along with GNU Emacs. If not, see . */ /* 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 diff --git a/src/s/netbsd.h b/src/s/netbsd.h index ce3b2afa1b..23e7254192 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -21,8 +21,6 @@ along with GNU Emacs. If not, see . */ /* 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 says we must include signal.h diff --git a/src/s/unixware.h b/src/s/unixware.h index 1f35287f6d..e9ebb63f30 100644 --- a/src/s/unixware.h +++ b/src/s/unixware.h @@ -44,8 +44,6 @@ along with GNU Emacs. If not, see . */ 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 -- 2.39.2