procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move PENDING_OUTPUT_COUNT from src/s to configure

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-07-10 00:37:17 -07:00
parent 882cf227ab
commit d02eb359e6
8 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,7 @@
2012-07-10 Glenn Morris <rgm@gnu.org>
* 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 <schwab@linux-m68k.org>

12
configure.ac
View file

@ -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; })])

3
src/ChangeLog
View file

@ -11,6 +11,9 @@
2012-07-10 Glenn Morris <rgm@gnu.org>
* 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.

2
src/s/cygwin.h
View file

@ -74,8 +74,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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

3
src/s/darwin.h
View file

@ -92,9 +92,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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

2
src/s/freebsd.h
View file

@ -23,8 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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

2
src/s/netbsd.h
View file

@ -21,8 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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 <woods@weird.com> says we must include signal.h

2
src/s/unixware.h
View file

@ -44,8 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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