Mercurial > emacs
changeset 2917:725698689fbd
Some more changes from Michael K. Johnson for Linux.
* s/template.h: Mention that you should #define HAVE_TERMIO or
HAVE_TERMIOS, but not both, and that HAVE_TERMIOS is preferred.
* systty.h (EMACS_SET_TTY_PGRP): Don't assign the return value of
tcsetpgrp to *pgid; it's just a status value.
* config.h.in (HAVE_RANDOM): This shouldn't be defined on Linux
systems using XFree386, and perhaps is inappropriate in general.
* m/intel386.h: #undefine the integer size macros, since the Linux
<values.h> file #defines them itself.
* mem-limits.h (get_lim_data): Linux has the ulimit call; if it
fails, fall back on ULIMIT_BREAK_VALUE.
* process.c: Linux needs the WAITTYPE, etc. definitions.
* unexec.c (hdr, ohdr): Linux has the ordinary `struct exec' type;
no need to use SYSV names.
* s/linux.h: New file.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 20 May 1993 02:14:56 +0000 |
| parents | 375bf7b38e48 |
| children | 718a69677759 |
| files | src/config.in src/mem-limits.h src/process.c src/s/template.h src/systty.h src/unexec.c |
| diffstat | 6 files changed, 26 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/config.in Thu May 20 02:05:02 1993 +0000 +++ b/src/config.in Thu May 20 02:14:56 1993 +0000 @@ -183,8 +183,11 @@ /* joe@zircon.uucp says that in order to use XFree386, you have to link against -lXbsd, which insists on defining the random - function. */ -#ifdef HAVE_XFREE386 + function. + faith@cs.unc.edu says this is bogus for Linux and several other OS's. + Eventually, we should have autoconf test for this. Anyone want to + submit a patch? */ +#if defined (HAVE_XFREE386) && !defined (LINUX) #define LIBX11_SYSTEM -lXbsd #define HAVE_RANDOM #endif
--- a/src/mem-limits.h Thu May 20 02:05:02 1993 +0000 +++ b/src/mem-limits.h Thu May 20 02:14:56 1993 +0000 @@ -77,11 +77,18 @@ get_lim_data () { extern long ulimit (); - + + lim_data = -1; + + /* Use the ulimit call, if we seem to have it. */ +#if !defined (ULIMIT_BREAK_VALUE) || defined (LINUX) + lim_data = ulimit (3, 0); +#endif + + /* If that didn't work, just use the macro's value. */ #ifdef ULIMIT_BREAK_VALUE - lim_data = ULIMIT_BREAK_VALUE; -#else - lim_data = ulimit (3, 0); + if (lim_data == -1) + lim_data = ULIMIT_BREAK_VALUE; #endif lim_data -= (long) data_space_start;
--- a/src/process.c Thu May 20 02:05:02 1993 +0000 +++ b/src/process.c Thu May 20 02:14:56 1993 +0000 @@ -110,7 +110,7 @@ #ifndef VMS #ifndef WAITTYPE -#if !defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER) +#if (!defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER)) || defined (LINUX) #define WAITTYPE int #define WIFSTOPPED(w) ((w&0377) == 0177) #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0)
--- a/src/s/template.h Thu May 20 02:05:02 1993 +0000 +++ b/src/s/template.h Thu May 20 02:14:56 1993 +0000 @@ -79,16 +79,16 @@ /* * Define HAVE_TERMIOS if the system provides POSIX-style * functions and macros for terminal control. + * + * Define HAVE_TERMIO if the system provides sysV-style ioctls + * for terminal control. + * + * Do not define both. HAVE_TERMIOS is prefered, if it is + * supported on your system. */ #define HAVE_TERMIOS - -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - -#define HAVE_TERMIO +/* #define HAVE_TERMIO */ /* * Define HAVE_TIMEVAL if the system supports the BSD style clock values.
--- a/src/systty.h Thu May 20 02:05:02 1993 +0000 +++ b/src/systty.h Thu May 20 02:14:56 1993 +0000 @@ -218,7 +218,7 @@ #ifdef HAVE_TERMIOS #define EMACS_GET_TTY_PGRP(fd, pgid) (*(pgid) = tcgetpgrp ((fd))) -#define EMACS_SET_TTY_PGRP(fd, pgid) (*(pgid) = tcsetpgrp ((fd), *(pgid))) +#define EMACS_SET_TTY_PGRP(fd, pgid) (tcsetpgrp ((fd), *(pgid))) #else #ifdef TIOCSPGRP
--- a/src/unexec.c Thu May 20 02:05:02 1993 +0000 +++ b/src/unexec.c Thu May 20 02:14:56 1993 +0000 @@ -235,7 +235,7 @@ #else /* not HPUX */ -#if defined (USG) && !defined (IBMAIX) && !defined (IRIS) && !defined (COFF_ENCAPSULATE) +#if defined (USG) && !defined (IBMAIX) && !defined (IRIS) && !defined (COFF_ENCAPSULATE) && !defined (LINUX) static struct bhdr hdr, ohdr; #define a_magic fmagic #define a_text tsize