aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorDan Nicolaescu <[email protected]>2008-06-26 04:24:54 +0000
committerDan Nicolaescu <[email protected]>2008-06-26 04:24:54 +0000
commitf2a77c3a41744e43b52f0ac7a2c9bd7f8d406ae1 (patch)
tree05d027376fd22d8624eefdd512362109f7b2389a /src/s
parent3617b1eb8da69a836148741cd35a7d8ec59191af (diff)
* unexnext.c:
* m/ews4800.h: * m/hp9000s300.h: * m/ibm370aix.h: * m/mips-siemens.h: * m/ncr386.h: * m/next.h: * m/pmax.h: * m/powerpcle.h: * m/tandem-s2.h: * s/386bsd.h: * s/bsd386.h: * s/bsd4-1.h: * s/bsd4-2.h: * s/bsdos2-1.h: * s/bsdos2.h: * s/bsdos3.h: * s/bsdos4.h: * s/nextstep.h: * s/ultrix4-3.h: * s/usg5-0.h: * s/usg5-2-2.h: * s/usg5-2.h: * s/usg5-4-3.h: * s/ux4800.h: * s/uxpds.h: * s/uxpv.h: Remove support for obsolete systems. * s/hpux.h, s/hpux10.h, s/hpux8.h, s/hpux9.h, s/hpux9shr.h: Remove, insert contents in s/hpux-10.20.h * s/aix3-1.h, s/aix3-2-5.h, s/aix3-2.h, s/aix4-1.h, s/aix4.h: Remove, insert contents in s/aix-4.2.h * s/usg5-3.h: Remove, insert contents in s/usg5-4.h. * s/bsd4-3.h: Rename to .. * s/bsd-common.h: ... this. * src/data.c: * src/doc.c: * src/ecrt0.c: * src/emacs.c: * src/fileio.c: * src/floatfns.c: * src/keyboard.c: * src/mem-limits.h: * src/print.c: * src/process.c: * src/sysdep.c: * src/syssignal.h: * src/systty.h: * src/syswait.h: * src/term.c: * src/unexec.c: * src/unexelf.c: * src/unexhp9k800.c: * src/m/hp800.h: * src/m/ibmrs6000.h: * src/m/mips.h: * src/m/vax.h: * src/s/darwin.h: * src/s/freebsd.h: * src/s/gnu.h: * src/s/ms-w32.h: * src/s/msdos.h: * src/s/netbsd.h: * src/s/template.h: Remove references to obsolete variables. * Makefile.in: Add dependencies for all unexec files. (admindir): Remove unused variable. (UNEXEC_SRC): Remove references. * config.nt: Remove reference to UNEXEC_SRC. * lwlib.c: Remove references to obsolete variables. * fakemail.c: Remove references to obsolete variables. * os.texi: Remove references to obsolete systems. * configure.in: * configure: Remove references to obsolete systems.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/386bsd.h27
-rw-r--r--src/s/aix3-1.h210
-rw-r--r--src/s/aix3-2-5.h33
-rw-r--r--src/s/aix3-2.h73
-rw-r--r--src/s/aix4-1.h65
-rw-r--r--src/s/aix4-2.h206
-rw-r--r--src/s/aix4.h17
-rw-r--r--src/s/bsd-common.h (renamed from src/s/bsd4-3.h)0
-rw-r--r--src/s/bsd386.h67
-rw-r--r--src/s/bsd4-1.h131
-rw-r--r--src/s/bsd4-2.h122
-rw-r--r--src/s/bsdos2-1.h9
-rw-r--r--src/s/bsdos2.h14
-rw-r--r--src/s/bsdos3.h9
-rw-r--r--src/s/bsdos4.h26
-rw-r--r--src/s/darwin.h6
-rw-r--r--src/s/freebsd.h17
-rw-r--r--src/s/gnu.h4
-rw-r--r--src/s/hpux.h218
-rw-r--r--src/s/hpux10-20.h269
-rw-r--r--src/s/hpux10.h85
-rw-r--r--src/s/hpux8.h96
-rw-r--r--src/s/hpux9.h94
-rw-r--r--src/s/hpux9shr.h16
-rw-r--r--src/s/ms-w32.h10
-rw-r--r--src/s/msdos.h10
-rw-r--r--src/s/netbsd.h4
-rw-r--r--src/s/nextstep.h114
-rw-r--r--src/s/template.h3
-rw-r--r--src/s/ultrix4-3.h16
-rw-r--r--src/s/usg5-0.h149
-rw-r--r--src/s/usg5-2-2.h152
-rw-r--r--src/s/usg5-2.h152
-rw-r--r--src/s/usg5-3.h202
-rw-r--r--src/s/usg5-4-3.h11
-rw-r--r--src/s/usg5-4.h173
-rw-r--r--src/s/ux4800.h20
-rw-r--r--src/s/uxpds.h11
-rw-r--r--src/s/uxpv.h14
39 files changed, 600 insertions, 2255 deletions
diff --git a/src/s/386bsd.h b/src/s/386bsd.h
deleted file mode 100644
index 706fbf23ac..0000000000
--- a/src/s/386bsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* s/ file for 386bsd system. */
-
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
-
-#undef LIB_STANDARD
-#define LIB_STANDARD -lc $(GNULIB_VAR)
-
-/* The following should be set to /netbsd if you are running netbsd > 0.8
- Or just link /netbsd -> /386bsd */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/386bsd"
-
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
-/* Need to use GNU make, as system make has problems */
-#define MAKE_COMMAND gmake
-#define LIBS_DEBUG
-
-/* For mem-limits.h. */
-#define BSD4_2
-
-/* This affects a declaration in xrdb.c. */
-#define DECLARE_GETPWUID_WITH_UID_T
-
-/* arch-tag: 8a114892-0863-4285-a4cb-3d66ba2d8e7b
- (do not change this comment) */
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
deleted file mode 100644
index bcc4b10dc7..0000000000
--- a/src/s/aix3-1.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Definitions file for GNU Emacs running on IBM AIX version 3.1
- Copyright (C) 1985, 1986, 1990, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-#define USG5
-
-/* Specify IBM AIX version of system */
-
-#ifndef AIX
-#define AIX
-#endif
-
-/* turn off c prototypes */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-/* This symbol should be defined on AIX Version 3 ??????? */
-#ifndef _AIX
-#define _AIX
-#endif
-
-/* Specify "_BSD" to invoke Berkeley compatibility in header files */
-/*#ifndef _BSD
-#define _BSD
-#endif
-*/
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "aix"
-
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-/* #define NOMULTIPLEJOBS */
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
- To get the name of the slave side, you just ttyname() the master side. */
-
-#define PTY_ITERATION for (c = 0; !c ; c++)
-#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
-#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIOS
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-#define HAVE_SOCKETS
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-/* #define NONSYSTEM_DIR_LIBRARY */
-
-/*
- * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- * library functions. Almost, but not quite the same as
- * the 4.2 functions
- */
-
-#define SYSV_SYSTEM_DIR
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-#define BSTRING
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is supposed to work now on system V release 2. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-/* #define CLASH_DETECTION */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special itemss needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask) /* Null expansion */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* On USG systems these have different names */
-
-#define index strchr
-#define rindex strrchr
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions. */
-
-#undef static
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-/* #define ADDR_CORRECT(x) (x) */
-
-#ifndef __GNUC__
-#define LINKER cc
-#endif
-
-/* Prevent -lg from being used for debugging. Not needed. */
-
-#define LIBS_DEBUG
-
-/* No need to specify -lc when linking. */
-
-#define LIB_STANDARD
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* The following definition seems to be needed in AIX version 3.1.6.8.
- It may not have been needed in certain earlier versions. */
-#define HAVE_TCATTR
-
-#define SYSTEM_MALLOC
-
-/* Include unistd.h, even though we don't define POSIX. */
-#define NEED_UNISTD_H
-
-/* AIX doesn't define this. */
-#define unix 1
-
-/* AIX 3.1 has the HFT features. */
-#define AIXHFT
-
-/* For unexaix.c. */
-#define ALIGN_DATA_RELOC
-
-/* arch-tag: bfff798c-542d-4290-91f2-267394c85b7b
- (do not change this comment) */
diff --git a/src/s/aix3-2-5.h b/src/s/aix3-2-5.h
deleted file mode 100644
index 6c8458cc8a..0000000000
--- a/src/s/aix3-2-5.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* s- file for building Emacs on AIX 3.2.5. */
-
-#include "aix3-2.h"
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. [email protected] */
-/* The above isn't generally true. If it occurs with some compiler
- release, seek a fixed version, be it XLC or GCC. The XLC version
- isn't tied to the OS version on AIX any more than elsewhere. XLC
- (the IBM compiler) can use -g with -O. (-O3 is also a possibility
- for the optimization level.) -- fx, after David Edelsohn. */
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -g -O
-
-/* Perry Smith <[email protected]> says these are correct. */
-#define SIGNALS_VIA_CHARACTERS
-#define MAIL_USE_LOCKF
-#define CLASH_DETECTION
-
-/* Perry Smith <[email protected]> says these are correct. */
-#define POSIX_SIGNALS
-#undef sigmask
-#undef sigsetmask
-#undef _setjmp
-#undef _longjmp
-
-/* Bill Woodward <[email protected]> says:
- libIM *must* precede libXm, to avoid getting aixLoadIM error messages. */
-#define LIB_MOTIF -lIM -lXm
-
-/* arch-tag: 692b3acb-5383-4cfb-93f6-378b5c48c75e
- (do not change this comment) */
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
deleted file mode 100644
index 6d6c734c07..0000000000
--- a/src/s/aix3-2.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* s- file for building Emacs on AIX 3.2.
-
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#include "aix3-1.h"
-
-#define AIX3_2
-
-/* No need to define this--the header files indicate X11R4,
- and that's supposedly what 3.2 will come with. */
-#undef SPECIFY_X11R4
-
-#ifndef __GNUC__
-/* Some programs in src produce warnings saying certain subprograms
- are to comples and need a MAXMEM value greater than 2000 for
- additional optimization. [email protected] */
-#define C_SWITCH_SYSTEM -ma -qmaxmem=4000
-#endif
-
-/* Adrian Colley <[email protected]> says this is needed. */
-#ifndef NOT_C_CODE
-#ifndef AIX4
- #pragma alloca
-#endif
-#endif
-
-#undef rindex
-#undef index
-
-/* With this defined, a gcc-compiled Emacs crashed in realloc under AIX
- 3.2, and a cc-compiled Emacs works with this undefined.
-#undef SYSTEM_MALLOC
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. [email protected] */
-/* See comments about this in aix3-2-5.h. -- fx */
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH -g -O
-#endif
-
-/* The character-composition stuff is broken in X11R5.
- Even with XIMStatusNothing aliased to XIMStatusNone,
- [email protected] (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
- lose declaring char * rindex without this.
- It is just a guess which versions of AIX need this definition. */
-#undef HAVE_STRING_H
-
-/* arch-tag: 0935754d-67e1-4697-978a-3e9976da05c3
- (do not change this comment) */
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
deleted file mode 100644
index 6b8361420a..0000000000
--- a/src/s/aix4-1.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#define AIX4_1
-
-#include "aix4.h"
-
-/* [email protected] says -li18n is needed by -lXm. */
-#undef LIB_MOTIF
-#define LIB_MOTIF -lXm -li18n
-
-#ifdef __GNUC__
-#undef _NO_PROTO
-#endif
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. [email protected].
- 4.1 seems to need -g again. -- [email protected]. */
-/* David Edelsohn <[email protected]> says that this actually depends
- on the version of XLC, which can't be predicted from the system version.
- What a mess! */
-/* No more of a mess than other systems, GNU+GCC included. See
- comments in aix3-2-5.h. -- fx */
-#if 0
-#ifndef __GNUC__
-#undef C_DEBUG_SWITCH
-#undef C_OPTIMIZE_SWITCH
-#define C_DEBUG_SWITCH -g
-#endif
-#endif
-
-/* The X internationalization stuff is still broken in AIX 4.1, so
- don't #undef X11R5_INHIBIT_I18N
- It still causes shift, ctrl, and alt to resend the last character,
- if it was a control character like tab, enter, backspace, or ESC.
- Bill_Mann @ PraxisInt.com */
-/* #undef X11R5_INHIBIT_I18N */
-
-#ifndef HAVE_LIBXMU
-#define LIBXMU
-
-/* Unfortunately without libXmu we cannot support EditRes. */
-#define NO_EDITRES
-#endif
-
-/* arch-tag: 72d598e1-bc3e-48e0-bfd2-693917c3738e
- (do not change this comment) */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index c23987d2d9..2b31e2c816 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,194 @@
-#include "aix4-1.h"
+/*
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
-#undef ALIGN_DATA_RELOC
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+/*
+ * Define symbols to identify the version of Unix this is.
+ * Define all the symbols that apply correctly.
+ */
+
+#define USG /* System III, System V, etc */
+#define USG5
+
+/* This symbol should be defined on AIX Version 3 ??????? */
+#ifndef _AIX
+#define _AIX
+#endif
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "aix"
+
+/* In AIX, you allocate a pty by opening /dev/ptc to get the master side.
+ To get the name of the slave side, you just ttyname() the master side. */
+
+#define PTY_ITERATION for (c = 0; !c ; c++)
+#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc");
+#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd));
+
+/*
+ * Define HAVE_TERMIO if the system provides sysV-style ioctls
+ * for terminal control.
+ */
+
+#define HAVE_TERMIOS
+
+/*
+ * Define HAVE_PTYS if the system supports pty devices.
+ */
+
+#define HAVE_PTYS
+
+/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
+
+#define HAVE_SOCKETS
+
+/*
+ * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
+ * The 4.2 opendir, etc., library functions.
+ */
+
+/* #define NONSYSTEM_DIR_LIBRARY */
+
+/*
+ * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
+ * library functions. Almost, but not quite the same as
+ * the 4.2 functions
+ */
+
+#define SYSV_SYSTEM_DIR
+
+/* Define this symbol if your system has the functions bcopy, etc. */
+
+#define BSTRING
+
+/* subprocesses should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ This is supposed to work now on system V release 2. */
+
+#define subprocesses
+
+/* The file containing the kernel's symbol table is called /unix. */
+
+#define KERNEL_FILE "/unix"
+
+/* The symbol in the kernel where the load average is found
+ is named avenrun. */
+
+#define LDAV_SYMBOL "avenrun"
+
+/* Special itemss needed to make Emacs run on this system. */
+
+
+
+/* USG systems tend to put everything declared static
+ into the initialized data area, which becomes pure after dumping Emacs.
+ Foil this. Emacs carefully avoids static vars inside functions. */
+
+#undef static
+
+/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
+
+/* #define ADDR_CORRECT(x) (x) */
+
+#ifndef __GNUC__
+#define LINKER cc
+#endif
+
+/* Prevent -lg from being used for debugging. Not needed. */
+
+#define LIBS_DEBUG
+
+/* No need to specify -lc when linking. */
+
+#define LIB_STANDARD
+
+/* Use terminfo instead of termcap. */
+
+#define TERMINFO
+
+/* The following definition seems to be needed in AIX version 3.1.6.8.
+ It may not have been needed in certain earlier versions. */
+#define HAVE_TCATTR
+
+/* Include unistd.h, even though we don't define POSIX. */
+#define NEED_UNISTD_H
+
+/* AIX doesn't define this. */
+#define unix 1
+
+#ifndef __GNUC__
+/* Some programs in src produce warnings saying certain subprograms
+ are to comples and need a MAXMEM value greater than 2000 for
+ additional optimization. [email protected] */
+#define C_SWITCH_SYSTEM -ma -qmaxmem=4000
+#endif
+
+/* The character-composition stuff is broken in X11R5.
+ Even with XIMStatusNothing aliased to XIMStatusNone,
+ [email protected] (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
+ lose declaring char * rindex without this.
+ It is just a guess which versions of AIX need this definition. */
+#undef HAVE_STRING_H
+
+/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
+ because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
+ "cc -g" crashes. Go figure. [email protected] */
+/* The above isn't generally true. If it occurs with some compiler
+ release, seek a fixed version, be it XLC or GCC. The XLC version
+ isn't tied to the OS version on AIX any more than elsewhere. XLC
+ (the IBM compiler) can use -g with -O. (-O3 is also a possibility
+ for the optimization level.) -- fx, after David Edelsohn. */
+#define C_DEBUG_SWITCH -g -O
+
+/* Perry Smith <[email protected]> says these are correct. */
+#define SIGNALS_VIA_CHARACTERS
+#define MAIL_USE_LOCKF
+#define CLASH_DETECTION
+
+/* Perry Smith <[email protected]> says these are correct. */
+#define POSIX_SIGNALS
+#undef sigmask
+
+/* Dave Love <[email protected]> reported this as needed on AIX 4.1.
+ It is just a guess which versions of AIX need this definition. */
+#define HAVE_WAIT_HEADER
+
+/* Specify the type that the 3rd arg of `accept' points to.
+ It is just a guess which versions of AIX need this definition. */
+#define SOCKLEN_TYPE int
+
+/* [email protected] says -li18n is needed by -lXm. */
+#define LIB_MOTIF -lXm -li18n
+
+#ifndef HAVE_LIBXMU
+#define LIBXMU
+
+/* Unfortunately without libXmu we cannot support EditRes. */
+#define NO_EDITRES
+#endif
/* On AIX Emacs uses the gmalloc.c malloc implementation. But given
the way this system works, libc functions that return malloced
@@ -20,19 +208,5 @@
*/
#define BROKEN_GET_CURRENT_DIR_NAME 1
-/* aix3-1.h defined _NO_PROTO, probably to work around an AIX compiler
- that did not handle prototypes. On (at least) AIX 5.2, this causes
- the proper prototype to be thrown away for lseek64, so compiled
- Lisp files do not load correctly and compilation fails.
-
- The AIX compiler should have learned about function prototypes long
- ago, so we can probably go ahead and undefine _NO_PROTO. However,
- if someone can demonstrate that this problem still exists for AIX
- 4, this should be moved into a new file (aix5.h).
-*/
-
-#undef _NO_PROTO
-
-
/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
(do not change this comment) */
diff --git a/src/s/aix4.h b/src/s/aix4.h
deleted file mode 100644
index b2ed15f75e..0000000000
--- a/src/s/aix4.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#define AIX4
-
-#include "aix3-2-5.h"
-
-/* AIX 4 does not have HFT any more. */
-#undef AIXHFT
-
-/* Dave Love <[email protected]> reported this as needed on AIX 4.1.
- It is just a guess which versions of AIX need this definition. */
-#define HAVE_WAIT_HEADER
-
-/* Specify the type that the 3rd arg of `accept' points to.
- It is just a guess which versions of AIX need this definition. */
-#define SOCKLEN_TYPE int
-
-/* arch-tag: b9471dfc-ccdc-4980-a8a1-80c7627ec6b2
- (do not change this comment) */
diff --git a/src/s/bsd4-3.h b/src/s/bsd-common.h
index 2a94916eb1..2a94916eb1 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd-common.h
diff --git a/src/s/bsd386.h b/src/s/bsd386.h
deleted file mode 100644
index ee869ac62d..0000000000
--- a/src/s/bsd386.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* s/ file for bsd386 system.
-
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#include "bsd4-3.h"
-
-#ifndef __bsdi__
-#define __bsdi__ 1
-#endif
-
-#define DECLARE_GETPWUID_WITH_UID_T
-
-#define SIGNALS_VIA_CHARACTERS
-
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-
-#define LIBS_DEBUG
-#define LIB_X11_LIB -L/usr/X11/lib -lX11
-#define LIBS_SYSTEM -lutil -lkvm -lcompat
-
-#define HAVE_GETLOADAVG 1
-
-#undef BSD_PGRPS
-
-/* System uses OXTABS instead of the expected TAB3.
- (Copied from netbsd.h.) */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
-#define SYSV_SYSTEM_DIR
-
-#define HAVE_TERMIOS
-#define NO_TERMIO
-
-#define WAITTYPE int
-/* get this since it won't be included if WAITTYPE is defined */
-#ifdef emacs
-#include <sys/wait.h>
-#endif
-#define WRETCODE(w) WEXITSTATUS(w)
-#ifndef WCOREDUMP
-#define WCOREDUMP(w) ((w) & 0200)
-#endif
-
-#define GETPGRP_NO_ARG 1
-
-/* arch-tag: 867e3bb8-e9df-4763-9c82-8f4accb8209e
- (do not change this comment) */
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
deleted file mode 100644
index 9a08b5ea9c..0000000000
--- a/src/s/bsd4-1.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Definitions file for GNU Emacs running on bsd 4.1.
- Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define BSD4_1
-
-#define BSD_SYSTEM
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-/* #define NOMULTIPLEJOBS */
-
-/* Default is to set interrupt_input to 1: do input buffering within Emacs */
-
-#define INTERRUPT_INPUT
-
-/* First pty name is /dev/ptyp0. */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-/* #define HAVE_PTYS */
-
-/* Define this macro if system defines a type `union wait'. */
-
-#define HAVE_UNION_WAIT
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-/* #define HAVE_SOCKETS */
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-#define NONSYSTEM_DIR_LIBRARY
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-/* #define BSTRING */
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is generally OS dependent, and not supported
- under most USG systems. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-#undef CLASH_DETECTION /* Might work; not tried yet. */
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* Make the function `signal' act as in 4.2. */
-
-#define signal sigset
-
-#define _longjmp longjmp
-#define _setjmp setjmp
-
-#define lstat stat
-
-/* Names of flags for open. */
-#define O_RDONLY 0
-#define O_WRONLY 1
-#define O_RDWR 2
-#define O_EXCL 2000
-#define O_CREAT 1000
-
-/* Special library needed for linking for 4.1. */
-#define LIBS_SYSTEM -ljobs
-
-/* arch-tag: de56716a-ed9b-4851-a5c5-c882efaf9931
- (do not change this comment) */
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
deleted file mode 100644
index 665e12a535..0000000000
--- a/src/s/bsd4-2.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Definitions file for GNU Emacs running on bsd 4.2
- Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#ifndef BSD4_2
-#define BSD4_2 1
-#endif /* BSD4_2 */
-
-#ifndef BSD_SYSTEM
-#define BSD_SYSTEM 42
-#endif /* BSD_SYSTEM */
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-/* #define NOMULTIPLEJOBS */
-
-/* Default is to set interrupt_input to 1: do input buffering within Emacs */
-
-#define INTERRUPT_INPUT
-
-/* First pty name is /dev/ptyp0. */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-#define HAVE_PTYS
-
-/* Define this macro if system defines a type `union wait'. */
-
-#define HAVE_UNION_WAIT
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-#define HAVE_SOCKETS
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-/* #define NONSYSTEM_DIR_LIBRARY */
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-#define BSTRING
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is generally OS dependent, and not supported
- under most USG systems. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-#define CLASH_DETECTION
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Send signals to subprocesses by "typing" special chars at them. */
-
-#define SIGNALS_VIA_CHARACTERS
-
-/* Process groups work in the traditional BSD manner. */
-
-#define BSD_PGRPS
-
-/* arch-tag: 38ca640f-549e-4726-a257-71048ab4c480
- (do not change this comment) */
diff --git a/src/s/bsdos2-1.h b/src/s/bsdos2-1.h
deleted file mode 100644
index 244d58f513..0000000000
--- a/src/s/bsdos2-1.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* s/ file for BSDI BSD/OS 2.1 system. */
-
-#include "bsdos2.h"
-
-#undef LIB_X11_LIB
-#define LIB_X11_LIB -L/usr/X11/lib -lX11 -lipc
-
-/* arch-tag: cf1ada4a-cdbf-452b-a264-ff84dd523e97
- (do not change this comment) */
diff --git a/src/s/bsdos2.h b/src/s/bsdos2.h
deleted file mode 100644
index 9e1e82fd75..0000000000
--- a/src/s/bsdos2.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* s/ file for BSDI BSD/OS 2.0 system. */
-
-#include "bsd386.h"
-
-#define TEXT_START 0x1020 /* for QMAGIC */
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#define HAVE_TERMIOS
-#define NO_TERMIO
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/bsd"
-
-/* arch-tag: 25ce1827-1511-4305-9058-24dd2118b5b4
- (do not change this comment) */
diff --git a/src/s/bsdos3.h b/src/s/bsdos3.h
deleted file mode 100644
index 20a9704e14..0000000000
--- a/src/s/bsdos3.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* s/ file for BSDI BSD/OS 3.0 system. */
-
-#include "bsdos2.h"
-
-#undef LIBS_SYSTEM
-#define LIBS_SYSTEM -lkvm
-
-/* arch-tag: 726766f3-5a62-48bf-8e21-3b21ec6abe6f
- (do not change this comment) */
diff --git a/src/s/bsdos4.h b/src/s/bsdos4.h
deleted file mode 100644
index 540e4a7d79..0000000000
--- a/src/s/bsdos4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* s/ file for BSDI BSD/OS 4.0 system. */
-
-#include "bsdos3.h"
-
-/* BSD/OS 4.1 and later have ncurses */
-#ifdef HAVE_LIBNCURSES
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-#endif /* HAVE_LIBNCURSES */
-
-/* copied from freebsd.h */
-#ifdef __ELF__
-
-#define LD_SWITCH_SYSTEM
-#undef START_FILES
-#define START_FILES \
- pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define UNEXEC unexelf.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#undef LIB_GCC
-#define LIB_GCC
-
-#endif /* not __ELF__ */
-
-/* arch-tag: 7659632a-a879-4153-bb8b-3765a1463ca1
- (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index d7f7cf2234..aa509b75af 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -23,12 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
* Define all the symbols that apply correctly.
*/
-/* #define UNIPLUS */
-/* #define USG5 */
-/* #define USG */
-/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
#define BSD4_2
/* BSD4_3 and BSD4_4 are already defined in sys/param.h */
/* #define BSD4_3 */
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 9a21b0931e..843a34b6fe 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -40,19 +40,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define NO_SHARED_LIBS
#endif
-
-#if 0 /* This much, alone, seemed sufficient as of 19.23.
- But it seems better to be independent of netbsd.h. */
-#include "netbsd.h"
-
-#undef LIB_GCC
-#define LIB_GCC -lgcc
-#undef NEED_ERRNO
-#endif /* 0 */
-
-
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
+/* Get most of the stuff from bsd-common */
+#include "bsd-common.h"
/* For mem-limits.h. */
#define BSD4_2
@@ -161,7 +150,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
ioctl TIOCSCTTY. */
#define DONT_REOPEN_PTY
-/* CLASH_DETECTION is defined in bsd4-3.h.
+/* CLASH_DETECTION is defined in bsd-common.h.
In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links
remaining in /tmp or other directories with +t bit.
To avoid this problem, you could #undef it to use no file lock. */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index fbc3f944e6..b5a839ec98 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
+/* Get most of the stuff from bsd-common */
+#include "bsd-common.h"
/* For mem-limits.h. */
#define BSD4_2
diff --git a/src/s/hpux.h b/src/s/hpux.h
deleted file mode 100644
index 785fff1262..0000000000
--- a/src/s/hpux.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Definitions file for GNU Emacs running on HPUX release 7.0.
- Based on AT&T System V.2.
- Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-#define HPUX
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "hpux"
-
-/* `nomultiplejobs' should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one).
-
- On hpux this depends on the precise kind of machine in use,
- so the m- file defines this symbol if appropriate. */
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIO
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-#define HAVE_PTYS
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-#define HAVE_SOCKETS
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-/* #define NONSYSTEM_DIR_LIBRARY */
-
-/* Define this symbol if your system has the functions bcopy, etc.
- * s800 and later versions of s300 (s200) kernels have equivalents
- * of the BSTRING functions of BSD. If your s200 kernel doesn't have
- * em comment out this section.
- */
-
-#define BSTRING
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is generally OS dependent, and not supported
- under most USG systems. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Say we have the SYSV style of interprocess communication. */
-
-#define HAVE_SYSVIPC
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-#define CLASH_DETECTION
-
-/* The file containing the kernel's symbol table is called /hp-ux. */
-
-#define KERNEL_FILE "/hp-ux"
-
-/* The symbol in the kernel where the load average is found
- depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-/* HPUX has sigsetmask */
-/* #define sigsetmask(mask) / * Null expansion * / */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-/* HP-UX has _setjmp and _longjmp */
-/*
-#define _setjmp setjmp
-#define _longjmp longjmp
-*/
-
-/* Use the system provided termcap(3) library */
-#define TERMINFO
-
-/* The 48-bit versions are more winning for Emacs;
- the ordinary ones don't give even 32 bits. */
-#define random lrand48
-#define srandom srand48
-
-/* In hpux, the symbol SIGIO is defined, but the feature
- doesn't work in the way Emacs needs it to. */
-
-#define BROKEN_SIGIO
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions.
- http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00368.html
- As of at least HPUX 11.11 (2000), it seems this workaround is no
- longer needed. Try uncommenting the following if you have problems
- on older versions. */
-
-/* This is unnecessary in HPUX versions 10.20, 11.0, 11.11, 11.23. */
-
-/* #define static */
-
-/* Define extra libraries to load.
- This should have -lBSD, but that library is said to make
- `signal' fail to work. */
-
-#ifdef HPUX_NET
-#define LIBS_SYSTEM -ln
-#else
-#define LIBS_SYSTEM
-#endif
-
-/* Some additional system facilities exist. */
-
-#define HAVE_PERROR /* Delete this line for version 6. */
-
-/* The following maps shared exec file to demand loaded exec.
- Don't do this as demand loaded exec is broken in hpux. */
-
-#if 0
-
-/* Adjust a header field for the executable file about to be dumped. */
-
-#define ADJUST_EXEC_HEADER \
- hdr.a_magic = ((ohdr.a_magic.file_type == OLDMAGIC.file_type) ? \
- NEWMAGIC : ohdr.a_magic);
-
-#endif
-
-/* Baud-rate values in tty status have nonstandard meanings. */
-
-#define BAUD_CONVERT \
-{ 0, 50, 75, 110, 135, 150, 200, 300, 600, 900, 1200, \
- 1800, 2400, 3600, 4800, 7200, 9600, 19200, 38400 }
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
-
-/* This is how to get the device name of the control end of a pty. */
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);
-
-/* This triggers a conditional in xfaces.c. */
-#define XOS_NEEDS_TIME_H
-
-#ifndef HPUX8
-/* It's possible that HPUX 7 has sys/wait.h but it does not work right. */
-#undef HAVE_SYS_WAIT_H
-#endif
-
-/* arch-tag: 75c1239f-fedb-4f64-8f86-7893e75699e8
- (do not change this comment) */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index a15b81a5e9..8ea24fc4dc 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,13 +1,270 @@
-#include "hpux10.h"
+/* System description file for hpux version 10.20.
+ Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
-#define HPUX10_20
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+
+#define RUN_TIME_REMAP
+
+/*
+ * Define symbols to identify the version of Unix this is.
+ * Define all the symbols that apply correctly.
+ */
+
+#define USG /* System III, System V, etc */
+
+#define USG5
+
+#define HPUX
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "hpux"
+
+/* `nomultiplejobs' should be defined if your system's shell
+ does not have "job control" (the ability to stop a program,
+ run some other program, then continue the first one).
+
+ On hpux this depends on the precise kind of machine in use,
+ so the m- file defines this symbol if appropriate. */
+
+/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
+
+/* #define INTERRUPT_INPUT */
+
+/* Letter to use in finding device name of first pty,
+ if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */
+
+#define FIRST_PTY_LETTER 'p'
+
+/*
+ * Define HAVE_TERMIO if the system provides sysV-style ioctls
+ * for terminal control.
+ */
+
+#define HAVE_TERMIO
+
+/*
+ * Define HAVE_PTYS if the system supports pty devices.
+ */
+
+#define HAVE_PTYS
+
+/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
+
+#define HAVE_SOCKETS
+
+/* Define this symbol if your system has the functions bcopy, etc.
+ * s800 and later versions of s300 (s200) kernels have equivalents
+ * of the BSTRING functions of BSD. If your s200 kernel doesn't have
+ * em comment out this section.
+ */
+
+#define BSTRING
+
+/* subprocesses should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ This is generally OS dependent, and not supported
+ under most USG systems. */
+
+#define subprocesses
+
+/* If your system uses COFF (Common Object File Format) then define the
+ preprocessor symbol "COFF". */
+
+/* #define COFF */
+
+/* define MAIL_USE_FLOCK if the mailer uses flock
+ to interlock access to /usr/spool/mail/$USER.
+ The alternative is that a lock file named
+ /usr/spool/mail/$USER.lock. */
+
+/* #define MAIL_USE_FLOCK */
+
+/* Say we have the SYSV style of interprocess communication. */
+
+#define HAVE_SYSVIPC
+
+/* Define CLASH_DETECTION if you want lock files to be written
+ so that Emacs can tell instantly when you try to modify
+ a file that someone else has modified in his Emacs. */
+
+#define CLASH_DETECTION
+
+/* The symbol in the kernel where the load average is found
+ depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
+
+/* Special hacks needed to make Emacs run on this system. */
+
+/*
+ * Make the sigsetmask function go away. Don't know what the
+ * ramifications of this are, but doesn't seem possible to
+ * emulate it properly anyway at this point.
+ */
+
+/* HPUX has sigsetmask */
+/* #define sigsetmask(mask) / * Null expansion * / */
+
+/* setjmp and longjmp can safely replace _setjmp and _longjmp,
+ but they will run slower. */
+
+/* HP-UX has _setjmp and _longjmp */
+/*
+#define _setjmp setjmp
+#define _longjmp longjmp
+*/
+
+/* Use the system provided termcap(3) library */
+#define TERMINFO
+
+/* In hpux, the symbol SIGIO is defined, but the feature
+ doesn't work in the way Emacs needs it to. */
+
+#define BROKEN_SIGIO
+
+/* USG systems tend to put everything declared static
+ into the initialized data area, which becomes pure after dumping Emacs.
+ Foil this. Emacs carefully avoids static vars inside functions.
+ http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00368.html
+ As of at least HPUX 11.11 (2000), it seems this workaround is no
+ longer needed. Try uncommenting the following if you have problems
+ on older versions. */
+
+/* This is unnecessary in HPUX versions 10.20, 11.0, 11.11, 11.23. */
+
+/* #define static */
+
+/* Some additional system facilities exist. */
+
+#define HAVE_PERROR /* Delete this line for version 6. */
+
+/* The following maps shared exec file to demand loaded exec.
+ Don't do this as demand loaded exec is broken in hpux. */
+
+/* Baud-rate values in tty status have nonstandard meanings. */
+
+#define BAUD_CONVERT \
+{ 0, 50, 75, 110, 135, 150, 200, 300, 600, 900, 1200, \
+ 1800, 2400, 3600, 4800, 7200, 9600, 19200, 38400 }
+
+/* This is how to get the device name of the tty end of a pty. */
+#define PTY_TTY_NAME_SPRINTF \
+ sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
+
+/* This is how to get the device name of the control end of a pty. */
+#define PTY_NAME_SPRINTF \
+ sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);
+
+/* This triggers a conditional in xfaces.c. */
+#define XOS_NEEDS_TIME_H
+
+/* Don't use shared libraries. unexec doesn't handle them.
+ Note GCC automatically passes -a archive to ld, and it has its own
+ conflicting -a. */
+#ifdef __GNUC__
+
+#define LD_SWITCH_SYSTEM_TEMACS
+
+#else /* not __GNUC__ */
+/* Note, -a only works for hpux ld, not cc. And "cc LD_SWITCH_SYSTEM"
+ is used in configure's $ac_link to do various autoconf checks.
+ Since we only need -a when unexec'ing, only pass in -a to
+ "ld temacs" ([email protected] 7/10/97). */
+#if (defined(hp9000s700) || defined(__hp9000s700))
+#define LD_SWITCH_SYSTEM_TEMACS -L/lib/pa1.1
+#else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
+#define LD_SWITCH_SYSTEM_TEMACS
+#endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
+#endif /* not __GNUC__ */
+
+/* Some hpux 8 machines seem to have TIOCGWINSZ,
+ and none have sioctl.h, so might as well define this. */
+#define NO_SIOCTL_H
+
+#ifndef HAVE_LIBXMU
+/* HP-UX doesn't supply Xmu. */
+#define LIBXMU
+
+#endif
+
+/* Assar Westerlund <[email protected]> says this is necessary for
+ HP-UX 10.20, and that it works for HP-UX 0 as well. */
+#define NO_EDITRES
+
+/* Tested in getloadavg.c. */
+#define HAVE_PSTAT_GETDYNAMIC
+
+/* Eric Backus <[email protected]> says, HP-UX 9.x on HP 700 machines
+ has a broken `rint' in some library versions including math library
+ version number A.09.05.
+
+ You can fix the math library by installing patch number PHSS_4630.
+ But we can fix it more reliably for Emacs like this. */
+#undef HAVE_RINT
+
+/* We have to go this route, rather than hpux9's approach of renaming the
+ functions via macros. The system's stdlib.h has fully prototyped
+ declarations, which yields a conflicting definition of srand48; it
+ tries to redeclare what was once srandom to be srand48. So we go
+ with HAVE_LRAND48 being defined. */
+#undef srandom
+#undef random
+#undef HAVE_RANDOM
+
+#define FORCE_ALLOCA_H
+
+/* AlainF 20-Jul-1996 says this is right. */
+#define KERNEL_FILE "/stand/vmunix"
+
+#ifdef HPUX_NET
+#define LIBS_SYSTEM -ln -l:libdld.sl
+#else
+#define LIBS_SYSTEM -l:libdld.sl
+#endif
+
+/* Rainer Malzbender <[email protected]> says definining
+ HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
+ using GCC. */
+
+#ifndef HAVE_XRMSETDATABASE
+#define HAVE_XRMSETDATABASE
+#endif
+
+/* Make sure we get select from libc rather than from libcurses
+ because libcurses on HPUX 10.10 has a broken version of select.
+ We used to use -lc -lcurses, but this may be cleaner. */
+#define LIBS_TERMCAP -ltermcap
+
+/* However, HPUX 10 puts Xaw and Xmu in a strange place
+ (if you install them at all). So search that place. */
+#define C_SWITCH_X_SYSTEM -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/contrib/X11R5/include
+#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/Motif1.2 -L/usr/contrib/X11R5/lib
+
+/* 2000-11-21: Temporarily disable Unix 98 large file support found by
+ configure. It fails on HPUX 11, at least, because it enables
+ header sections which lose when `static' is defined away, as it is
+ on HP-UX. (You get duplicate symbol errors on linking). */
+
+#undef _FILE_OFFSET_BITS
/* otherwise sigunblock wont be defined */
#define POSIX_SIGNALS
-/* Polling problems (interrupted system call) reported for HP-UX 10.10
- don't exist from 10.20 on (see process.c) */
-#undef POLL_INTERRUPTED_SYS_CALL
-
/* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
(do not change this comment) */
diff --git a/src/s/hpux10.h b/src/s/hpux10.h
deleted file mode 100644
index 646ef07d4e..0000000000
--- a/src/s/hpux10.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* System description file for hpux version 10.
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#include "hpux9shr.h"
-
-#define HPUX10
-
-/* We have to go this route, rather than hpux9's approach of renaming the
- functions via macros. The system's stdlib.h has fully prototyped
- declarations, which yields a conflicting definition of srand48; it
- tries to redeclare what was once srandom to be srand48. So we go
- with HAVE_LRAND48 being defined. */
-#undef srandom
-#undef random
-#undef HAVE_RANDOM
-
-#define FORCE_ALLOCA_H
-
-/* AlainF 20-Jul-1996 says this is right. */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/stand/vmunix"
-
-#ifdef LIBS_SYSTEM
-#undef LIBS_SYSTEM
-#endif
-#ifdef HPUX_NET
-#define LIBS_SYSTEM -ln -l:libdld.sl
-#else
-#define LIBS_SYSTEM -l:libdld.sl
-#endif
-
-/* Rainer Malzbender <[email protected]> says definining
- HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
- using GCC. */
-
-#ifndef HAVE_XRMSETDATABASE
-#define HAVE_XRMSETDATABASE
-#endif
-
-/* Make sure we get select from libc rather than from libcurses
- because libcurses on HPUX 10.10 has a broken version of select.
- We used to use -lc -lcurses, but this may be cleaner. */
-#define LIBS_TERMCAP -ltermcap
-
-#undef C_SWITCH_X_SYSTEM
-#undef LD_SWITCH_X_DEFAULT
-/* However, HPUX 10 puts Xaw and Xmu in a strange place
- (if you install them at all). So search that place. */
-#define C_SWITCH_X_SYSTEM -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/contrib/X11R5/include
-#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/Motif1.2 -L/usr/contrib/X11R5/lib
-
-/* 2000-11-21: Temporarily disable Unix 98 large file support found by
- configure. It fails on HPUX 11, at least, because it enables
- header sections which lose when `static' is defined away, as it is
- on HP-UX. (You get duplicate symbol errors on linking). */
-
-#undef _FILE_OFFSET_BITS
-
-/* Don't define _BSD */
-#undef C_SWITCH_SYSTEM
-
-/* HP-UX 10.10 seem to have problems with signals coming in
- Causes "poll: interrupted system call" messages when Emacs is run
- in an X window (see process.c) */
-#define POLL_INTERRUPTED_SYS_CALL
-
-/* arch-tag: 1b95d569-a3c1-4fb0-8f69-fef264c17c24
- (do not change this comment) */
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
deleted file mode 100644
index 9333038b07..0000000000
--- a/src/s/hpux8.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* system description file for hpux version 8.
-
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-/*
-Commentary:
-
-This contains changes that were suggested "for the hp700".
-They were not needed for the 800.
-Our conjecture that they are needed for hpux version 8,
-which is what runs on the 700. */
-
-#define HPUX8
-
-#include "hpux.h"
-
-/* [email protected] says HPUX 8.07 needs this. He was using X11R5, I think. */
-#define LIBX11_SYSTEM -lXext
-
-#define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11
-#define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/include/X11R4
-#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R5 -L/usr/lib/X11R4
-
-/* Don't use shared libraries. unexec doesn't handle them.
- Note GCC automatically passes -a archive to ld, and it has its own
- conflicting -a. */
-#ifdef __GNUC__
-/* No need to specify roundabout way of linking temacs. */
-#define ORDINARY_LINK
-
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM_TEMACS
-#else
-#define LD_SWITCH_SYSTEM_TEMACS -Xlinker -a -Xlinker archive
-#endif
-
-#else /* not __GNUC__ */
-/* Note, -a only works for hpux ld, not cc. And "cc LD_SWITCH_SYSTEM"
- is used in configure's $ac_link to do various autoconf checks.
- Since we only need -a when unexec'ing, only pass in -a to
- "ld temacs" ([email protected] 7/10/97). */
-#if (defined(hp9000s700) || defined(__hp9000s700))
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM_TEMACS -L/lib/pa1.1
-#else
-#define LD_SWITCH_SYSTEM_TEMACS -a archive -L/lib/pa1.1
-#endif
-#else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM_TEMACS
-#else
-#define LD_SWITCH_SYSTEM_TEMACS -a archive
-#endif
-#endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
-#endif /* not __GNUC__ */
-
-/* Some hpux 8 machines seem to have TIOCGWINSZ,
- and none have sioctl.h, so might as well define this. */
-#define NO_SIOCTL_H
-
-#if 0 /* autoconf should be detecting the presence or absence of
- random and srandom now. */
-/* If you use X11R4 you must define this. If you use
- X11R5 you must comment this out */
-/* #define HAVE_RANDOM */
-#define random foo_random
-#define srandom foo_srandom
-#endif
-
-#if 0 /* This seems to be spurious. */
-/* "X11R5" on hpux8 doesn't have this function, which is supposed to exist
- in X11R5. Maybe things will work if we just don't call it. */
-#define NO_XRM_SET_DATABASE
-#endif
-
-/* Enable a special hack in XTread_socket. */
-#define X_IO_BUG
-
-/* arch-tag: 25fafe5c-b26c-43ab-8144-1629d59207ee
- (do not change this comment) */
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
deleted file mode 100644
index 9c915eb6cc..0000000000
--- a/src/s/hpux9.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* System description file for hpux version 9.
-
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#include "hpux8.h"
-
-#define HPUX9
-
-/* If Emacs doesn't seem to work when built to use GNU malloc, you
- probably need to get the latest patches to the HP/UX compiler.
- See `etc/MACHINES' for more information. */
-#if 0
-#define SYSTEM_MALLOC 1
-#undef GNU_MALLOC
-#undef REL_ALLOC
-#endif
-
-#ifndef __GNUC__
-/* Make room for enough symbols, so dispnew.c does not fail. */
-#define C_SWITCH_SYSTEM -Wp,-H200000 -D_BSD
-#else
-#define C_SWITCH_SYSTEM -D_BSD
-#endif
-
-#if 0 /* These definitions run into a bug in hpux
- whereby trying to disable the vdsusp character has no effect.
- supposedly there is no particular need for this. */
-#undef HAVE_TERMIO
-#define HAVE_TERMIOS
-#define NO_TERMIO
-#endif
-
-/* According to [email protected],
- references to the X11R4 directories in these variables
- (inherited from hpux8.h)
- cause the wrong libraries to be found,
- and the options to specify the X11R5 directories are unnecessary
- since the R5 files are found without them. */
-#undef LIB_X11_LIB
-#undef C_SWITCH_X_SYSTEM
-#undef LD_SWITCH_X_DEFAULT
-/* However, HPUX 9 has Motif includes in a strange place.
- So search that place. These definitions assume that X11R5 is being
- used -- if X11R4 is used, "s/hpux9-x11r4.h" gets loaded instead. */
-/* [email protected] says that the /usr/contrib/... dirs
- are needed to find the Xmu and Xaw libraries. */
-#define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/contrib/X11R5/include -I/usr/include/Motif1.2
-#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R5 -L/usr/contrib/X11R5/lib -L/usr/lib/Motif1.2
-
-#ifndef HAVE_LIBXMU
-/* HP-UX doesn't supply Xmu. */
-#define LIBXMU
-
-#endif
-
-/* Assar Westerlund <[email protected]> says this is necessary for
- HP-UX 10.20, and that it works for HP-UX 0 as well. */
-#define NO_EDITRES
-
-/* [email protected] says we don't need -lXext in HPUX 9. */
-#undef LIBX11_SYSTEM
-
-/* Tested in getloadavg.c. */
-#define HAVE_PSTAT_GETDYNAMIC
-
-/* Eric Backus <[email protected]> says, HP-UX 9.x on HP 700 machines
- has a broken `rint' in some library versions including math library
- version number A.09.05.
-
- You can fix the math library by installing patch number PHSS_4630.
- But we can fix it more reliably for Emacs like this. */
-#undef HAVE_RINT
-
-
-/* arch-tag: 0a5e9f05-012c-4962-a222-a7a3a7fe0ab7
- (do not change this comment) */
diff --git a/src/s/hpux9shr.h b/src/s/hpux9shr.h
deleted file mode 100644
index d273d2e778..0000000000
--- a/src/s/hpux9shr.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#define ORDINARY_LINK
-#define HPUX_USE_SHLIBS
-#define RUN_TIME_REMAP
-
-#include "hpux9.h"
-
-#if 0 /* No longer needed, since in current GCC -g no longer does that. */
-/* We must turn off -g since it forces -static. */
-#ifdef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH
-#endif
-#endif
-
-/* arch-tag: 1b259627-c5f6-4260-866f-781b06d72f6b
- (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 3e043c84fc..f617490bef 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -22,16 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
* Define all the symbols that apply correctly.
*/
-/* #define UNIPLUS */
-/* #define USG5 */
-/* #define USG */
-/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
-/* #define BSD4_2 */
-/* #define BSD4_3 */
-/* #define BSD_SYSTEM */
-/* #define VMS */
#ifndef WINDOWSNT
#define WINDOWSNT
#endif
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 2f5280f174..ea940e5383 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -26,16 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
* Define all the symbols that apply correctly.
*/
-/* #define UNIPLUS */
-/* #define USG5 */
-/* #define USG */
-/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
-/* #define BSD4_2 */
-/* #define BSD4_3 */
-/* #define BSD_SYSTEM */
-/* #define VMS */
#ifndef MSDOS
#define MSDOS
#endif
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index a61a4e7436..0e9b0a8443 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
+/* Get most of the stuff from bsd-common */
+#include "bsd-common.h"
#if defined (__alpha__) && !defined (__ELF__)
#define NO_SHARED_LIBS
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
deleted file mode 100644
index 03b5d86cbb..0000000000
--- a/src/s/nextstep.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Configuration file for the NeXTstep system.
- Copyright (C) 1990, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "bsd4-3.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. We'll need to undo the bsd one. */
-
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "next-mach"
-
-#ifndef NeXT
-#define NeXT
-#endif
-
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Defining KERNEL_FILE causes lossage because sys/file.h
- stupidly gets confused by it. */
-#undef KERNEL_FILE
-
-#define SYSTEM_MALLOC
-
-#define environ _environ
-
-/* This should be true for recent NeXT systems. At least since 3.2. */
-#define HAVE_MACH_MACH_H
-
-#if 0 /* I think these are never used--let's see. -- rms. */
-/* Mask for address bits within a memory segment */
-
-#define SEGSIZ 0x20000
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-#define HAVE_UNIX_DOMAIN
-
-/* Conflicts in process.c between ioctl.h & tty.h use of t_foo fields */
-
-#define NO_T_CHARS_DEFINES
-
-/* This avoids a problem in Xos.h when using co-Xist 3.01. */
-#define X_NOT_POSIX
-#endif /* 0 */
-
-/* Definitions for how to link. */
-
-/* Link this program just by running cc. */
-#define ORDINARY_LINK
-
-#define LD_SWITCH_SYSTEM -X
-
-/* Don't use -lc on the NeXT. */
-#ifdef NS_TARGET /* We use the dynamic libraries under Openstep for Mach 4.0 */
-#define LIB_STANDARD
-#else
-#define LIB_STANDARD -lsys_s
-#endif
-
-#define LIB_MATH -lm
-
-#define START_FILES pre-crt0.o
-
-#define LIB_X11_LIB -L/usr/lib/X11 -lX11
-
-/* We don't have a g library either, so override the -lg LIBS_DEBUG switch */
-
-#define LIBS_DEBUG
-
-/* We don't have a libgcc.a, so we can't let LIB_GCC default to -lgcc */
-
-#define LIB_GCC
-
-/* Definitions for how to dump. */
-
-#define UNEXEC unexnext.o
-
-/* start_of_text isn't actually used, so make it compile without error. */
-#define TEXT_START 0
-/* This seems to be right for end_of_text, but it may not be used anyway. */
-#define TEXT_END get_etext ()
-/* This seems to be right for end_of_data, but it may not be used anyway. */
-#define DATA_END get_edata ()
-
-/* Don't include string.h--it causes trouble. */
-#undef HAVE_STRING_H
-
-/* Tell emacs.c not to define abort. */
-#define NO_ABORT
-
-/* arch-tag: 5cd6fed4-a0be-4402-9349-85a80bc01d57
- (do not change this comment) */
diff --git a/src/s/template.h b/src/s/template.h
index 9745d8b6d6..b79e3370b7 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -25,12 +25,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
* Define all the symbols that apply correctly.
*/
-/* #define UNIPLUS */
/* #define USG5 */
/* #define USG */
/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
/* #define BSD4_2 */
/* #define BSD4_3 */
/* #define BSD_SYSTEM */
diff --git a/src/s/ultrix4-3.h b/src/s/ultrix4-3.h
deleted file mode 100644
index 2b4f379d3d..0000000000
--- a/src/s/ultrix4-3.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "bsd4-3.h"
-
-#define NEED_UNISTD_H
-#define HAVE_TERMIOS
-#define PREFER_VSUSP
-
-/* Must set the line discipline to this, to make termio work. */
-#define SET_LINE_DISCIPLINE TERMIODISC
-
-#ifndef NOT_C_CODE
-/* The address of this is used, but Ultrix header files don't declare it. */
-extern double rint ();
-#endif
-
-/* arch-tag: 927a396a-d50f-494b-960b-533671184ce1
- (do not change this comment) */
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
deleted file mode 100644
index 941c48dc5d..0000000000
--- a/src/s/usg5-0.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Definitions file for GNU Emacs running on AT&T's System V.0
- Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-#define USG5_0
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-#define NOMULTIPLEJOBS
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIO
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-/* #define HAVE_PTYS */
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-/* #define HAVE_SOCKETS */
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-#define NONSYSTEM_DIR_LIBRARY
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-/* #define BSTRING */
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is supposed to work now on system V release 2. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-/* #define CLASH_DETECTION */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask) /* Null expansion */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* On USG systems these have different names */
-
-#define index strchr
-#define rindex strrchr
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions. */
-
-#define static
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* arch-tag: a18bdba9-506d-40ed-9877-49fc27ce8cac
- (do not change this comment) */
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
deleted file mode 100644
index ae57e0f9eb..0000000000
--- a/src/s/usg5-2-2.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
- Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-#define NOMULTIPLEJOBS
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIO
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-/* #define HAVE_PTYS */
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-/* #define HAVE_SOCKETS */
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-#define NONSYSTEM_DIR_LIBRARY
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-/* #define BSTRING */
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is supposed to work now on system V release 2. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-/* #define CLASH_DETECTION */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask) /* Null expansion */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* On USG systems these have different names */
-
-#define index strchr
-#define rindex strrchr
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions. */
-
-#define static
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* arch-tag: 56923f22-9e2b-4814-b922-88c87657ff6b
- (do not change this comment) */
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
deleted file mode 100644
index fe1a873d78..0000000000
--- a/src/s/usg5-2.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
- Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-#define NOMULTIPLEJOBS
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIO
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-/* #define HAVE_PTYS */
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-/* #define HAVE_SOCKETS */
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-#define NONSYSTEM_DIR_LIBRARY
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-/* #define BSTRING */
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is supposed to work now on system V release 2. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-/* #define CLASH_DETECTION */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask) /* Null expansion */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* On USG systems these have different names */
-
-#define index strchr
-#define rindex strrchr
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions. */
-
-#define static
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* arch-tag: cfd9500f-0284-4a88-8f07-3f56b42db13b
- (do not change this comment) */
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
deleted file mode 100644
index 3a03f421fd..0000000000
--- a/src/s/usg5-3.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Definitions file for GNU Emacs running on AT&T's System V Release 3
- Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-#define USG5_3
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* nomultiplejobs should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one). */
-
-#define NOMULTIPLEJOBS
-
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/*
- * Define HAVE_TERMIO if the system provides sysV-style ioctls
- * for terminal control.
- */
-
-#define HAVE_TERMIO
-
-/*
- * Define HAVE_PTYS if the system supports pty devices.
- */
-
-/* Some versions of V.3 have this, but not all.
- #define HAVE_PTYS
- #define SYSV_PTYS */
-
-/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
-
-/* #define HAVE_SOCKETS */
-
-/*
- * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
- * The 4.2 opendir, etc., library functions.
- */
-
-/* #define NONSYSTEM_DIR_LIBRARY */
-
-/*
- * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
- * library functions. Almost, but not quite the same as
- * the 4.2 functions
- */
-#define SYSV_SYSTEM_DIR
-
-/* Define this symbol if your system has the functions bcopy, etc. */
-
-/* #define BSTRING */
-
-/* subprocesses should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- This is supposed to work now on system V release 2. */
-
-#define subprocesses
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define CLASH_DETECTION if you want lock files to be written
- so that Emacs can tell instantly when you try to modify
- a file that someone else has modified in his Emacs. */
-
-/* #define CLASH_DETECTION */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Define this if system V IPC is available. */
-
-#define HAVE_SYSVIPC
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/*
- * Make the sigsetmask function go away. Don't know what the
- * ramifications of this are, but doesn't seem possible to
- * emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask) /* Null expansion */
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* On USG systems these have different names */
-#ifndef HAVE_INDEX
-#define index strchr
-#endif /* ! defined (HAVE_INDEX) */
-#ifndef HAVE_RINDEX
-#define rindex strrchr
-#endif /* ! defined (HAVE_RINDEX) */
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this. Emacs carefully avoids static vars inside functions. */
-
-#define static
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* Some variants have TIOCGETC, but the structures to go with it
- are not declared. */
-
-#define BROKEN_TIOCGETC
-
-/* AT&T SVr3 X wants to be linked with shared libraries */
-
-#define LIB_X11_LIB -lX11_s
-
-/* X needs to talk on the network, so search the network library. */
-
-#define LIBX11_SYSTEM -lpt -lnls -lnsl_s -lc_s
-
-/* The docs for system V/386 suggest v.3 has sigpause,
- so let's give it a try. */
-#define HAVE_SYSV_SIGPAUSE
-
-/* Some variants have TIOCGWINSZ, but the structures to go with it
- are not declared. */
-
-#define BROKEN_TIOCGWINSZ
-
-/* If we're using the System V X port, BSD bstring functions will be handy */
-
-#ifdef HAVE_X_WINDOWS
-#define BSTRING
-#endif /* HAVE_X_WINDOWS */
-
-/* Enable support for shared libraries in unexec. */
-
-#define USG_SHARED_LIBRARIES
-
-/* On USG systems signal handlers return void */
-
-#define SIGTYPE void
-
-/* arch-tag: 2bca65fd-f015-44b9-a2aa-9f8170ce89ca
- (do not change this comment) */
diff --git a/src/s/usg5-4-3.h b/src/s/usg5-4-3.h
deleted file mode 100644
index 8d05e8b3fa..0000000000
--- a/src/s/usg5-4-3.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* s/ file for System V release 4.3. */
-
-#include "usg5-4-2.h"
-
-/* [email protected]: without this switch emacs generates this error
- on start up for an i486-ncr-sysv4.3 (running the X toolkit):
- _XipOpenIM() Unable to find Atom _XIM_INPUTMETHOD */
-#define X11R5_INHIBIT_I18N
-
-/* arch-tag: 03ac8b3a-c3d4-4441-a773-1c1d9f111f1a
- (do not change this comment) */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 2fa7043554..79cc10ac03 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -24,34 +24,155 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Use the SysVr3 file for at least base configuration. */
-#include "usg5-3.h"
+#define USG /* System III, System V, etc */
+#define USG5
#define USG5_4
-/* We do have multiple jobs. Handle ^Z. */
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ It sets the Lisp variable system-type. */
-#undef NOMULTIPLEJOBS
+#define SYSTEM_TYPE "usg-unix-v"
-/* Motif needs -lgen. */
-#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
-#define ORDINARY_LINK
+/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-#if 0
-#ifdef ORDINARY_LINK
-#define LIB_STANDARD -lc /usr/ucblib/libucb.a
-#else
-#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
-#define LIB_STANDARD -lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o
-#endif
-#else
+/* #define INTERRUPT_INPUT */
+
+/*
+ * Define HAVE_TERMIO if the system provides sysV-style ioctls
+ * for terminal control.
+ */
+
+#define HAVE_TERMIO
+
+/*
+ * Define HAVE_PTYS if the system supports pty devices.
+ */
+
+/* Some versions of V.3 have this, but not all.
+ #define HAVE_PTYS
+ #define SYSV_PTYS */
+
+/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
+
+/* #define HAVE_SOCKETS */
+
+/*
+ * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
+ * The 4.2 opendir, etc., library functions.
+ */
+
+/* #define NONSYSTEM_DIR_LIBRARY */
+
+/*
+ * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
+ * library functions. Almost, but not quite the same as
+ * the 4.2 functions
+ */
+#define SYSV_SYSTEM_DIR
+
+/* Define this symbol if your system has the functions bcopy, etc. */
+
+/* #define BSTRING */
+
+/* subprocesses should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ This is supposed to work now on system V release 2. */
+
+#define subprocesses
+
+/* If your system uses COFF (Common Object File Format) then define the
+ preprocessor symbol "COFF". */
+
+#define COFF
+
+/* define MAIL_USE_FLOCK if the mailer uses flock
+ to interlock access to /usr/spool/mail/$USER.
+ The alternative is that a lock file named
+ /usr/spool/mail/$USER.lock. */
+
+/* #define MAIL_USE_FLOCK */
+
+/* Define CLASH_DETECTION if you want lock files to be written
+ so that Emacs can tell instantly when you try to modify
+ a file that someone else has modified in his Emacs. */
+
+/* #define CLASH_DETECTION */
+
+/* The file containing the kernel's symbol table is called /unix. */
+
+#define KERNEL_FILE "/unix"
+
+/* The symbol in the kernel where the load average is found
+ is named avenrun. */
+
+#define LDAV_SYMBOL "avenrun"
+
+/* Define this if system V IPC is available. */
+
+#define HAVE_SYSVIPC
+
+/* Special hacks needed to make Emacs run on this system. */
+
+/*
+ * Make the sigsetmask function go away. Don't know what the
+ * ramifications of this are, but doesn't seem possible to
+ * emulate it properly anyway at this point.
+ */
+
+#define sigsetmask(mask) /* Null expansion */
+
+/* setjmp and longjmp can safely replace _setjmp and _longjmp,
+ but they will run slower. */
+
+#define _setjmp setjmp
+#define _longjmp longjmp
+
+/* On USG systems these have different names */
+#ifndef HAVE_INDEX
+#define index strchr
+#endif /* ! defined (HAVE_INDEX) */
+#ifndef HAVE_RINDEX
+#define rindex strrchr
+#endif /* ! defined (HAVE_RINDEX) */
+
+/* USG systems tend to put everything declared static
+ into the initialized data area, which becomes pure after dumping Emacs.
+ Foil this. Emacs carefully avoids static vars inside functions. */
+
+#define static
+
+/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
+
+#define ADDR_CORRECT(x) (x)
+
+/* Use terminfo instead of termcap. */
+
+#define TERMINFO
+
+
+/* The docs for system V/386 suggest v.3 has sigpause,
+ so let's give it a try. */
+#define HAVE_SYSV_SIGPAUSE
+
+
+/* If we're using the System V X port, BSD bstring functions will be handy */
+
+#ifdef HAVE_X_WINDOWS
+#define BSTRING
+#endif /* HAVE_X_WINDOWS */
+
+/* Enable support for shared libraries in unexec. */
+
+#define USG_SHARED_LIBRARIES
+
+/* On USG systems signal handlers return void */
+
+#define SIGTYPE void
-#ifdef ORDINARY_LINK
-#define LIB_STANDARD
-#else
#define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o
#define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
-#endif
-#endif
/* there are no -lg libraries on this system, and no libPW */
@@ -109,8 +230,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define HAVE_PTYS
#define HAVE_TERMIOS
-#undef BROKEN_TIOCGWINSZ
-#undef BROKEN_TIOCGETC
/* It is possible to receive SIGCHLD when there are no children
waiting, because a previous waitsys(2) cleaned up the carcass of child
@@ -132,7 +251,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* This change means that we don't loop through allocate_pty too many
times in the (rare) event of a failure. */
-#undef FIRST_PTY_LETTER
#define FIRST_PTY_LETTER 'z'
/* This sets the name of the master side of the PTY. */
@@ -170,16 +288,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
fatal ("ioctl I_PUSH ttcompat", errno);
-/* Undo the SVr3 X11 library definition */
-#undef LIB_X11_LIB
-
-/* The definition of this in s-usg5-3.h is not needed in 5.4. */
-/* liblnsl_s should never be used. The _s suffix implies a shared
- library, as opposed to a DLL. Share libraries were used in SVR3, and are
- available only in order to allow SVR3 binaries to run. They should not be
- linked in to new binaries. -- [email protected]. */
-#undef LIBX11_SYSTEM
-
/* Tell x11term.c and keyboard.c we have the system V streams feature. */
#define SYSV_STREAMS
@@ -189,7 +297,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Markus Weiand <[email protected]> says this is needed for Motif on
SINIX. */
-#undef LIBS_SYSTEM
#define LIBS_SYSTEM -lgen
/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
diff --git a/src/s/ux4800.h b/src/s/ux4800.h
deleted file mode 100644
index 1c8729f416..0000000000
--- a/src/s/ux4800.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Definitions file for GNU Emacs running on NEC's UX/4800 (SVR4.2MP) */
-#include "usg5-4-2.h"
-#undef LIB_MOTIF
-#ifndef nec_ews
-#define nec_ews
-#endif
-#ifndef nec_ews_svr4
-#define nec_ews_svr4
-#endif
-#define XOS_NEEDS_TIME_H
-#define HAVE_CLOCK
-#ifdef __STDC__
-#define MKDIR_PROTOTYPE int mkdir(char *dpath, mode_t dmode)
-#endif
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH -O -KOlimit=3000 -ZXNd=5000
-#endif
-
-/* arch-tag: e42eeb13-028a-490b-8427-0b57010f2ab9
- (do not change this comment) */
diff --git a/src/s/uxpds.h b/src/s/uxpds.h
deleted file mode 100644
index c3ddf1039c..0000000000
--- a/src/s/uxpds.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Handle uxpds */
-
-#include "usg5-4-2.h"
-
-/* This triggers a conditional in xfaces.c. */
-#define XOS_NEEDS_TIME_H
-
-#define FSCALE 256
-
-/* arch-tag: c02db2a6-c725-4a6b-adee-66e0303df2a8
- (do not change this comment) */
diff --git a/src/s/uxpv.h b/src/s/uxpv.h
deleted file mode 100644
index 9571545598..0000000000
--- a/src/s/uxpv.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* System description file for Fujitsu UXP/V
- This file describes the parameters that system description files
- should define or not. */
-
-#include "usg5-4-2.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "uxpv"
-
-/* arch-tag: 3f00cfe7-f44c-45ce-a2fe-2b17fc411a1e
- (do not change this comment) */