comparison src/s/usg5-4.h @ 5494:861f2601a38b

Sync s/ files with GNU 23.1.92, delete obsolete stuff, simplify other stuff --- ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * configure: * configure.ac (XE_EXPAND_VARIABLE): * configure.ac (TAB): irix6-0.h renamed to irix6-5.h; sco7.h deleted. bsd4-3.h renamed to bsd-common.h. Simplify setting machine= for intel386, mips. Put back linux.h. Incorporate some stuff about debug/optimization flags in irix6-5.h into configure.ac. Add a comment about LCC stuff with optimization flags that should be fixed up. --- src/ChangeLog 2010-02-20 Ben Wing <ben@xemacs.org> * sysdep.c: * sysdep.c (qxe_reliable_signal): * sysdep.c (retry_open_1): * sysdep.c (retry_close): * sysdep.c (retry_read_1): * sysdep.c (retry_write_1): * sysdep.c (retry_fopen): * sysdep.c (retry_fclose): * sysdep.c (retry_fread): * sysdep.c (retry_fwrite): Remove conditionalization on INTERRUPTIBLE_IO, INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE -- always check for EINTR as there's no harm in it. Remove old #if 0'ed out SA_RESTART code. Use manifest constant IRIX6_5 instead of IRIX. * Makefile.in.in: * dired.c: * dired.c (Ffile_attributes): Use manifest constant IRIX6_5 instead of IRIX. Eliminate constant BSD4_2, use BSD4_3 instead. * getloadavg.c: * getloadavg.c (getloadavg): * getloadavg.c (LDAV_PRIVILEGED): * getloadavg.c (LDAV_DONE): Sync with GNU 23.1.92. 2010-02-20 Ben Wing <ben@xemacs.org> * s/README: * s/aix4-2.h: * s/aix4-2.h (MAIL_USE_LOCKF): * s/bsd-common.h: * s/freebsd.h: * s/freebsd.h (Carey): * s/freebsd.h (or): * s/gnu.h: * s/gnu.h (DATA_START): * s/hpux11-shr.h: * s/hpux11.h: * s/hpux11.h (random): * s/irix6-5.h: * s/linux.h: * s/mach-bsd4-3.h: * s/netbsd.h: * s/netbsd.h (or): * s/netbsd.h (A_TEXT_OFFSET): * s/netbsd.h (NO_MATHERR): * s/openbsd.h: * s/sol2.h: * s/usg5-4-2.h: * s/usg5-4.h: * s/usg5-4.h (or): * s/usg5-4.h (ORDINARY_LINK): Sync with GNU 23.1.92. Put back linux.h. Rename: bsd4-3.h -> bsd-common.h; irix6-0.h -> irix6-5.h. Delete: template.h (useless). Delete a whole bunch of obsolete stuff in sol2.h, linux.h, freebsd.h -- assume anything over 10 years old is sufficiently obsolete to be deleted. Remove LIBS_DEBUG, C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, KERNEL_FILE, LDAV_SYMBOL, most remaining PTY stuff, remaining TERMINFO/TERMCAP stuff. Update README appropriately. Remove stuff in hpux11-shr.h duplicated in hpux11.h. Remove sco7.h, identical with usg5-4-2.h. Remove unused POSIX flag, BROKEN_TIOC*, NO_SIOCTL_H. 2010-02-20 Ben Wing <ben@xemacs.org> * m/arm.h: * m/hp800.h: * m/intel386.h: * m/mips.h: * m/powerpc.h: * m/sparc.h: * m/template.h: Temporarily ifdef out all defines involving load-average stuff -- using define ENABLE_SM_FILE_DECLS_OF_LOADAVG_STUFF, which is not defined. I'm pretty sure getloadavg.c will take care of defining stuff properly on all systems without the need to duplicate the info in m/*. --ben Delete LIBS_TERMCAP; configure auto-handles this. Delete extra stuff in hp800.h. Delete C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, LDAV_SYMBOL; incorporate some stuff into configure.ac.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 06:03:00 -0600
parents aa5ed11f473b
children 1f0b15040456
comparison
equal deleted inserted replaced
5493:f62141fe007d 5494:861f2601a38b
1 /* Definitions file for XEmacs running on AT&T's System V Release 4 1 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
2 Copyright (C) 1987, 1990 Free Software Foundation, Inc. 2 Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4 Copyright (C) 2010 Ben Wing.
3 5
4 This file is part of XEmacs. 6 This file is part of GNU Emacs.
5 7
6 XEmacs is free software; you can redistribute it and/or modify 8 GNU Emacs is free software: you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2, or (at your option) 10 the Free Software Foundation, either version 3 of the License, or
9 any later version. 11 (at your option) any later version.
10 12
11 XEmacs is distributed in the hope that it will be useful, 13 GNU Emacs is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 16 GNU General Public License for more details.
15 17
16 You should have received a copy of the GNU General Public License 18 You should have received a copy of the GNU General Public License
17 along with XEmacs; see the file COPYING. If not, write to 19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19 Boston, MA 02111-1307, USA. */
20 20
21 /* Synched up with: FSF 19.31. */ 21 /* Synced up with: FSF 23.1.92. */
22 /* Synced by: Ben Wing, 2-18-10. */
22 23
23 /* This file written by James Van Artsdalen of Dell Computer Corporation. 24 /* This file written by James Van Artsdalen of Dell Computer Corporation.
24 * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric 25 * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric
25 * S. Raymond <esr@snark.thyrsus.com>. 26 * S. Raymond <esr@snark.thyrsus.com>.
26 */ 27 */
32 /* SYSTEM_TYPE should indicate the kind of system you are using. 33 /* SYSTEM_TYPE should indicate the kind of system you are using.
33 * It sets the Lisp variable system-type. */ 34 * It sets the Lisp variable system-type. */
34 35
35 #define SYSTEM_TYPE "usg-unix-v" 36 #define SYSTEM_TYPE "usg-unix-v"
36 37
37 /* Letter to use in finding device name of first pty, 38 /* Delete HAVE_TERMIO, SYSV_SYSTEM_DIR, KERNEL_FILE, LDAV_SYMBOL,
38 * if system supports pty's. 'p' means it is /dev/ptyp0 */ 39 sigsetmask, _setjmp, _longjmp, HAVE_INDEX, HAVE_RINDEX, TERMINFO,
40 HAVE_SYSV_SIGPAUSE, BSTRING, SIGTYPE -- not used in XEmacs or found by
41 configure */
39 42
40 #define FIRST_PTY_LETTER 'z'
41
42 /* define MAIL_USE_FLOCK if the mailer uses flock
43 * to interlock access to /usr/spool/mail/$USER.
44 * The alternative is that a lock file named
45 * /usr/spool/mail/$USER.lock. */
46
47 /* #define MAIL_USE_FLOCK */
48
49 /* The file containing the kernel's symbol table is called /unix. */
50
51 #define KERNEL_FILE "/unix"
52
53 /* The symbol in the kernel where the load average is found
54 * is named avenrun. */
55
56 #define LDAV_SYMBOL "avenrun"
57
58 /* Special hacks needed to make Emacs run on this system. */
59
60 /* On USG systems the system calls are interruptible by signals
61 * that the user program has elected to catch. Thus the system call
62 * must be retried in these cases. To handle this without massive
63 * changes in the source code, we remap the standard system call names
64 * to names for our own functions in sysdep.c that do the system call
65 * with retries. */
66
67 #define INTERRUPTIBLE_OPEN
68 #define INTERRUPTIBLE_IO
69
70 /* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
71
72 #define ADDR_CORRECT(x) (x)
73
74 /* Prevent -lg from being used for debugging. Not implemented? */
75
76 #define LIBS_DEBUG
77
78 /* Use terminfo instead of termcap. */
79
80 #define TERMINFO
81
82 /* 5.3 apparently makes close() interruptible */
83
84 #define INTERRUPTIBLE_CLOSE
85
86 /* Apparently -lg is provided in 5.3 */
87
88 #undef LIBS_DEBUG
89
90 /* Enable support for shared libraries in unexec. */
91
92 #define USG_SHARED_LIBRARIES
93
94 #define LIBS_SYSTEM "-lsocket -lnsl -lelf"
95 #define ORDINARY_LINK 43 #define ORDINARY_LINK
96 #define LIB_STANDARD
97 44
98 /* there are no -lg libraries on this system, and no libPW */ 45 /* there are no -lg libraries on this system, and no libPW */
99 46
100 #define LIBS_DEBUG 47 /* XEmacs deleted LIBS_DEBUG, LIB_STANDARD */
101 48
102 /* No <sioctl.h> */ 49 /* Undump with ELF */
103 50
104 #define NO_SIOCTL_H 51 #undef COFF
105 52
106 #define UNEXEC "unexelf.o" 53 #define UNEXEC "unexelf.o"
107 54
108 /* Get <sys/ttold.h> to get struct 55 /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct
109 * tchars. But get <termio.h> first to make sure ttold.h doesn't 56 * tchars. But get <termio.h> first to make sure ttold.h doesn't
110 * interfere. 57 * interfere. And don't try to use SIGIO yet.
111 */ 58 */
112 59
113 #ifndef NOT_C_CODE 60 #ifndef NOT_C_CODE
114 #include <sys/wait.h> 61 #include <sys/wait.h>
115 #endif 62 #endif
116 63
117 #ifdef emacs 64 #ifdef emacs
118 #include <sys/filio.h> 65 #include <sys/filio.h>
119 #include <termio.h> 66 #include <termio.h>
120 #include <sys/ttold.h> 67 #include <sys/ttold.h>
68 /* Delete #include <signal.h> */
121 #include <sys/stream.h> 69 #include <sys/stream.h>
70 #include <sys/stropts.h>
122 #include <sys/termios.h> 71 #include <sys/termios.h>
72 /* XEmacs -- GNU added this, but we never had it defined and C-g apparently
73 worked fine before, so don't define it */
74 /* #define BROKEN_SIGIO */
123 #endif 75 #endif
124 76
125 /* This sets the name of the master side of the PTY. */ 77 /* Delete NSIG_MINIMUM -- unused in XEmacs */
126 78
127 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); 79 /* Delete CLASH_DETECTION (config option), HAVE_PTYS, HAVE_TERMIOS,
80 wait3, WRETCODE, TIOCSIGSEND -- not used in XEmacs or found by configure */
128 81
129 /* This sets the name of the slave side of the PTY. On SysVr4, 82 /* Delete FIRST_PTY_LETTER, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF --
130 grantpt(3) forks a subprocess, so keep sigchld_handler() from 83 duplicative of code already in process-unix.c */
131 intercepting that death. If any child but grantpt's should die
132 within, it should be caught after EMACS_UNBLOCK_SIGNAL. */
133 84
134 /* XEmacs change */ 85 /* Delete SETUP_SLAVE_PTY -- unused in XEmacs */
135 #ifndef NOT_C_CODE
136 # if !__STDC__ && !defined(STDC_HEADERS)
137 char *ptsname ();
138 # endif
139 #endif
140 86
141 #define PTY_TTY_NAME_SPRINTF \ 87 /* Delete HAVE_SOCKETS -- autodetected */
142 { \
143 char *ptyname; \
144 \
145 EMACS_BLOCK_SIGCHLD; \
146 if (grantpt (fd) == -1) \
147 { close (fd); return -1; } \
148 EMACS_UNBLOCK_SIGCHLD; \
149 if (unlockpt (fd) == -1) \
150 { close (fd); return -1; } \
151 if (!(ptyname = ptsname (fd))) \
152 { close (fd); return -1; } \
153 strncpy (pty_name, ptyname, sizeof (pty_name)); \
154 pty_name[sizeof (pty_name) - 1] = 0; \
155 }
156 88
157 /* Push various streams modules onto a PTY channel. */
158 89
159 #define SETUP_SLAVE_PTY \
160 if (ioctl (xforkin, I_PUSH, "ptem") == -1) \
161 fatal ("ioctl I_PUSH ptem: errno %d\n", errno); \
162 if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \
163 fatal ("ioctl I_PUSH ldterm: errno %d\n", errno); \
164 if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
165 fatal ("ioctl I_PUSH ttcompat: errno %d\n", errno);
166 90
167 /* Tell x11term.c and keyboard.c we have the system V streams feature. */ 91 /* Begin XEmacs additions */
168 #define SYSV_STREAMS 92
93 /* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
94
95 #define ADDR_CORRECT(x) (x)
96
97 /* Enable support for shared libraries in unexec. */
98
99 #define USG_SHARED_LIBRARIES
100
101 #define LIBS_SYSTEM "-lsocket -lnsl -lelf"
102
169 /* On Some SysV System , w3 freeze. If freeze your xemacs , Add below definition */ 103 /* On Some SysV System , w3 freeze. If freeze your xemacs , Add below definition */
170 /* This definition added by Shogo Fujii(shogo@bsd1.kbnes.nec.co.jp) */ 104 /* This definition added by Shogo Fujii(shogo@bsd1.kbnes.nec.co.jp) */
171 #define PROCESS_IO_BLOCKING 105 #define PROCESS_IO_BLOCKING