Commit bdee2ef3 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* config.nt (HAVE_FACES): Remove, unused.

* s/vms.h: Use __GNUC__ instead of _GNUC_.

* m/macppc.h:
* m/alpha.h: Use GNU_LINUX instead of LINUX.  Reorganize conditionals.

* m/ibms390x.h (XINT, XUINT): Don't define, same as the default
(SPECIAL_EMACS_INT):
* m/ia64.h (SPECIAL_EMACS_INT):
* m/amdx86-64.h (SPECIAL_EMACS_INT):
* s/gnu.h (NLIST_STRUCT):
* aix4-2.h (X11R5_INHIBIT_I18N):
* s/gnu-linux.h (LINUX):
* s/msdos.h (HAVE_FACES):
* s/ms-w32.h (HAVE_FACES): Don't define, unused.

* systty.h:
* sysdep.c (setup_pty): Don't depend on SYSV_PTYS, it is not used
anymore.
parent f06b5ed2
...@@ -130,7 +130,6 @@ HAVE_CLOSEDIR ...@@ -130,7 +130,6 @@ HAVE_CLOSEDIR
HAVE_CRTIN HAVE_CRTIN
HAVE_DUP2 HAVE_DUP2
HAVE_EUIDACCESS HAVE_EUIDACCESS
HAVE_FACES
HAVE_FMOD HAVE_FMOD
HAVE_FPATHCONF HAVE_FPATHCONF
HAVE_FREXP HAVE_FREXP
...@@ -241,7 +240,6 @@ LIB_STANDARD ...@@ -241,7 +240,6 @@ LIB_STANDARD
LIB_STANDARD_LIBSRC LIB_STANDARD_LIBSRC
LINKER LINKER
LINK_CRTL_SHARE LINK_CRTL_SHARE
LINUX
LINUX_SBRK_BUG LINUX_SBRK_BUG
LISP_FLOAT_TYPE LISP_FLOAT_TYPE
LNOFLSH LNOFLSH
...@@ -263,7 +261,6 @@ NEED_BSDTTY ...@@ -263,7 +261,6 @@ NEED_BSDTTY
NEED_ERRNO NEED_ERRNO
NEED_LIBW NEED_LIBW
NEED_PTEM_H NEED_PTEM_H
NEED_SIOCTL
NEED_UNISTD_H NEED_UNISTD_H
NLIST_STRUCT NLIST_STRUCT
NOMULTIPLEJOBS NOMULTIPLEJOBS
...@@ -285,7 +282,6 @@ NSIG_MINIMUM ...@@ -285,7 +282,6 @@ NSIG_MINIMUM
NULL NULL
NULL_DEVICE NULL_DEVICE
N_BADMAG N_BADMAG
N_PAGSIZ
N_SYMOFF N_SYMOFF
N_TRELOFF N_TRELOFF
N_TXTOFF N_TXTOFF
...@@ -331,7 +327,6 @@ SIGQUIT ...@@ -331,7 +327,6 @@ SIGQUIT
SIGTRAP SIGTRAP
SIGTYPE SIGTYPE
SOLARIS2 SOLARIS2
SPECIAL_EMACS_INT
START_FILES START_FILES
START_FILES_1 START_FILES_1
STDC_HEADERS STDC_HEADERS
...@@ -369,7 +364,6 @@ VIRT_ADDR_VARIES ...@@ -369,7 +364,6 @@ VIRT_ADDR_VARIES
VMS VMS
WORDS_BIG_ENDIAN WORDS_BIG_ENDIAN
WRETCODE WRETCODE
X11R5_INHIBIT_I18N
XINT XINT
XOS_NEEDS_TIME_H XOS_NEEDS_TIME_H
XPNTR XPNTR
...@@ -379,7 +373,6 @@ _AIX ...@@ -379,7 +373,6 @@ _AIX
_ARCH_PPC64 _ARCH_PPC64
_CALLBACK_ _CALLBACK_
_FILE_OFFSET_BITS _FILE_OFFSET_BITS
_GNUC_
_LP64 _LP64
_MALLOC_INTERNAL _MALLOC_INTERNAL
_NAIVE_DOS_REGS _NAIVE_DOS_REGS
......
2008-07-13 Dan Nicolaescu <dann@ics.uci.edu>
* config.nt (HAVE_FACES): Remove, unused.
2008-06-26 Juanma Barranquero <lekktu@gmail.com> 2008-06-26 Juanma Barranquero <lekktu@gmail.com>
Eli Zaretskii <eliz@gnu.org> Eli Zaretskii <eliz@gnu.org>
......
...@@ -82,7 +82,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -82,7 +82,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
#define HAVE_WINDOW_SYSTEM #define HAVE_WINDOW_SYSTEM
#define MULTI_KBOARD #define MULTI_KBOARD
#define HAVE_FACES
#define HAVE_MOUSE #define HAVE_MOUSE
#endif #endif
......
2008-07-13 Dan Nicolaescu <dann@ics.uci.edu>
* s/vms.h: Use __GNUC__ instead of _GNUC_.
* m/macppc.h:
* m/alpha.h: Use GNU_LINUX instead of LINUX. Reorganize conditionals.
* m/ibms390x.h (XINT, XUINT): Don't define, same as the default
(SPECIAL_EMACS_INT):
* m/ia64.h (SPECIAL_EMACS_INT):
* m/amdx86-64.h (SPECIAL_EMACS_INT):
* s/gnu.h (NLIST_STRUCT):
* aix4-2.h (X11R5_INHIBIT_I18N):
* s/gnu-linux.h (LINUX):
* s/msdos.h (HAVE_FACES):
* s/ms-w32.h (HAVE_FACES): Don't define, unused.
* systty.h:
* sysdep.c (setup_pty): Don't depend on SYSV_PTYS, it is not used
anymore.
2008-07-12 Dan Nicolaescu <dann@ics.uci.edu> 2008-07-12 Dan Nicolaescu <dann@ics.uci.edu>
* syswait.h: Remove old if 0 code. Do not define WAITTYPE, it was * syswait.h: Remove old if 0 code. Do not define WAITTYPE, it was
......
...@@ -455,7 +455,7 @@ usage: (progn BODY...) */) ...@@ -455,7 +455,7 @@ usage: (progn BODY...) */)
} }
DEFUN ("prog1", Fprog1, Sprog1, 1, UNEVALLED, 0, DEFUN ("prog1", Fprog1, Sprog1, 1, UNEVALLED, 0,
doc: /* Eval FIRST and BODY sequentially; value from FIRST. doc: /* Eval FIRST and BODY sequentially; return value from FIRST.
The value of FIRST is saved during the evaluation of the remaining args, The value of FIRST is saved during the evaluation of the remaining args,
whose values are discarded. whose values are discarded.
usage: (prog1 FIRST BODY...) */) usage: (prog1 FIRST BODY...) */)
...@@ -489,7 +489,7 @@ usage: (prog1 FIRST BODY...) */) ...@@ -489,7 +489,7 @@ usage: (prog1 FIRST BODY...) */)
} }
DEFUN ("prog2", Fprog2, Sprog2, 2, UNEVALLED, 0, DEFUN ("prog2", Fprog2, Sprog2, 2, UNEVALLED, 0,
doc: /* Eval FORM1, FORM2 and BODY sequentially; value from FORM2. doc: /* Eval FORM1, FORM2 and BODY sequentially; return value from FORM2.
The value of FORM2 is saved during the evaluation of the The value of FORM2 is saved during the evaluation of the
remaining args, whose values are discarded. remaining args, whose values are discarded.
usage: (prog2 FORM1 FORM2 BODY...) */) usage: (prog2 FORM1 FORM2 BODY...) */)
......
...@@ -96,12 +96,15 @@ NOTE-END ...@@ -96,12 +96,15 @@ NOTE-END
#ifdef __ELF__ #ifdef __ELF__
#undef UNEXEC #undef UNEXEC
#define UNEXEC unexelf.o #define UNEXEC unexelf.o
#ifndef LINUX #ifndef GNU_LINUX
#define DATA_START 0x140000000 #define DATA_START 0x140000000
#endif #endif
#if (defined (__NetBSD__) || defined (__OpenBSD__))
#define HAVE_TEXT_START
#endif #endif
#ifndef __ELF__ #else /* not __ELF__ */
/* Describe layout of the address space in an executing process. */ /* Describe layout of the address space in an executing process. */
...@@ -112,9 +115,9 @@ NOTE-END ...@@ -112,9 +115,9 @@ NOTE-END
#define UNEXEC unexalpha.o #define UNEXEC unexalpha.o
#endif /* notdef __ELF__ */ #endif /* __ELF__ */
#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6 #if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
/* This controls a conditional in main. */ /* This controls a conditional in main. */
#define LINUX_SBRK_BUG #define LINUX_SBRK_BUG
#endif #endif
...@@ -123,7 +126,7 @@ NOTE-END ...@@ -123,7 +126,7 @@ NOTE-END
termio and struct termios are mutually incompatible. */ termio and struct termios are mutually incompatible. */
#define NO_TERMIO #define NO_TERMIO
#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) #if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
# define TEXT_END ({ extern int _etext; &_etext; }) # define TEXT_END ({ extern int _etext; &_etext; })
# ifndef __ELF__ # ifndef __ELF__
# define COFF # define COFF
...@@ -131,10 +134,6 @@ NOTE-END ...@@ -131,10 +134,6 @@ NOTE-END
# endif /* notdef __ELF__ */ # endif /* notdef __ELF__ */
#endif #endif
#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
#define HAVE_TEXT_START
#endif
/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN: /* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
they generate code that uses a signaling NaN instead of DBL_MIN. they generate code that uses a signaling NaN instead of DBL_MIN.
Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
......
...@@ -52,7 +52,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -52,7 +52,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define the type to use. */ /* Define the type to use. */
#define EMACS_INT long #define EMACS_INT long
#define EMACS_UINT unsigned long #define EMACS_UINT unsigned long
#define SPECIAL_EMACS_INT
/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
the 24-bit bit field into an int. In other words, if bit fields the 24-bit bit field into an int. In other words, if bit fields
......
...@@ -42,7 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -42,7 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define the type to use. */ /* Define the type to use. */
#define EMACS_INT long #define EMACS_INT long
#define EMACS_UINT unsigned long #define EMACS_UINT unsigned long
#define SPECIAL_EMACS_INT
/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
the 24-bit bit field into an int. In other words, if bit fields the 24-bit bit field into an int. In other words, if bit fields
......
...@@ -48,7 +48,6 @@ NOTE-END */ ...@@ -48,7 +48,6 @@ NOTE-END */
/* Define the type to use. */ /* Define the type to use. */
#define EMACS_INT long #define EMACS_INT long
#define EMACS_UINT unsigned long #define EMACS_UINT unsigned long
#define SPECIAL_EMACS_INT
/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
the 24-bit bit field into an int. In other words, if bit fields the 24-bit bit field into an int. In other words, if bit fields
...@@ -126,10 +125,6 @@ NOTE-END */ ...@@ -126,10 +125,6 @@ NOTE-END */
#define LINKER $(CC) -nostdlib #define LINKER $(CC) -nostdlib
/* Define XINT and XUINT so that they can take arguments of type int */
#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
#define XUINT(a) ((long) (a) & VALMASK)
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
#define XPNTR(a) XUINT (a) #define XPNTR(a) XUINT (a)
......
...@@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* #define NO_SOCK_SIGIO */ /* #define NO_SOCK_SIGIO */
#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) #if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
# define TEXT_END ({ extern int _etext; &_etext; }) # define TEXT_END ({ extern int _etext; &_etext; })
#endif #endif
...@@ -65,7 +65,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -65,7 +65,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
For MkLinux/LinuxPPC. */ For MkLinux/LinuxPPC. */
#ifdef LINUX #ifdef GNU_LINUX
#define LINKER $(CC) -nostdlib #define LINKER $(CC) -nostdlib
/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
because prefix-args is not used. */ because prefix-args is not used. */
......
...@@ -141,13 +141,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -141,13 +141,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define C_SWITCH_SYSTEM -ma -qmaxmem=4000 #define C_SWITCH_SYSTEM -ma -qmaxmem=4000
#endif #endif
/* The character-composition stuff is broken in X11R5.
Even with XIMStatusNothing aliased to XIMStatusNone,
tranle@intellicorp.com (Minh Tran-Le) reports that enabling
the internationalization code causes the modifier keys C, M and Shift
to beep after a mouse click. */
#define X11R5_INHIBIT_I18N
/* string.h defines rindex as a macro, at least with native cc, so we /* string.h defines rindex as a macro, at least with native cc, so we
lose declaring char * rindex without this. lose declaring char * rindex without this.
It is just a guess which versions of AIX need this definition. */ It is just a guess which versions of AIX need this definition. */
......
...@@ -25,11 +25,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -25,11 +25,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
* Define all the symbols that apply correctly. * Define all the symbols that apply correctly.
*/ */
/* #define UNIPLUS */
/* #define USG5 */ /* #define USG5 */
#define USG #define USG
/* #define BSD_SYSTEM */ /* #define BSD_SYSTEM */
#define LINUX
#define GNU_LINUX #define GNU_LINUX
/* SYSTEM_TYPE should indicate the kind of system you are using. /* SYSTEM_TYPE should indicate the kind of system you are using.
......
...@@ -27,8 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -27,8 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef SYSTEM_TYPE #undef SYSTEM_TYPE
#define SYSTEM_TYPE "gnu" #define SYSTEM_TYPE "gnu"
#undef NLIST_STRUCT
/* XXX should getloadavg be in libc? Should we have a libutil? /* XXX should getloadavg be in libc? Should we have a libutil?
#define HAVE_GETLOADAVG */ #define HAVE_GETLOADAVG */
#undef NLIST_STRUCT #undef NLIST_STRUCT
......
...@@ -296,7 +296,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -296,7 +296,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
#define HAVE_WINDOW_SYSTEM 1 #define HAVE_WINDOW_SYSTEM 1
#define HAVE_FACES 1
#define HAVE_MENUS 1 #define HAVE_MENUS 1
#endif #endif
......
...@@ -241,9 +241,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ ...@@ -241,9 +241,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
/* We canuse mouse menus. */ /* We canuse mouse menus. */
#define HAVE_MENUS #define HAVE_MENUS
/* We have support for faces. */
#define HAVE_FACES
/* Define one of these for easier conditionals. */ /* Define one of these for easier conditionals. */
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
/* We need a little extra space, see ../../lisp/loadup.el */ /* We need a little extra space, see ../../lisp/loadup.el */
......
...@@ -50,8 +50,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -50,8 +50,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/ */
/* Some versions of V.3 have this, but not all. /* Some versions of V.3 have this, but not all.
#define HAVE_PTYS #define HAVE_PTYS */
#define SYSV_PTYS */
/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
......
...@@ -149,7 +149,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -149,7 +149,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define rindex strrchr #define rindex strrchr
#define unlink delete #define unlink delete
#ifndef _GNUC_ #ifndef __GNUC__
extern double mth$dmod(double, double); extern double mth$dmod(double, double);
#endif #endif
......
...@@ -1866,7 +1866,7 @@ setup_pty (fd) ...@@ -1866,7 +1866,7 @@ setup_pty (fd)
Since the latter lossage is more benign, we may as well Since the latter lossage is more benign, we may as well
lose that way. -- cph */ lose that way. -- cph */
#ifdef FIONBIO #ifdef FIONBIO
#if defined(SYSV_PTYS) || defined(UNIX98_PTYS) #if defined(UNIX98_PTYS)
{ {
int on = 1; int on = 1;
ioctl (fd, FIONBIO, &on); ioctl (fd, FIONBIO, &on);
......
...@@ -109,12 +109,6 @@ static struct sensemode { ...@@ -109,12 +109,6 @@ static struct sensemode {
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef SYSV_PTYS
#include <sys/types.h>
#include <sys/tty.h>
#include <sys/pty.h>
#endif
/* Special cases - inhibiting the use of certain features. */ /* Special cases - inhibiting the use of certain features. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment