Commit 161aa2f8 authored by Jim Blandy's avatar Jim Blandy
Browse files

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.
parent 12a07afc
......@@ -183,8 +183,11 @@ and this notice must be preserved on all copies. */
/* 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
......
......@@ -77,13 +77,20 @@ static void
get_lim_data ()
{
extern long ulimit ();
#ifdef ULIMIT_BREAK_VALUE
lim_data = ULIMIT_BREAK_VALUE;
#else
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
if (lim_data == -1)
lim_data = ULIMIT_BREAK_VALUE;
#endif
lim_data -= (long) data_space_start;
}
......
......@@ -110,7 +110,7 @@ static Lisp_Object stream_process;
#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)
......
......@@ -79,16 +79,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/*
* Define HAVE_TERMIOS if the system provides POSIX-style
* functions and macros for terminal control.
*/
#define HAVE_TERMIOS
/*
*
* 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_TERMIO
#define HAVE_TERMIOS
/* #define HAVE_TERMIO */
/*
* Define HAVE_TIMEVAL if the system supports the BSD style clock values.
......
......@@ -218,7 +218,7 @@ static struct sensemode {
#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
......
......@@ -235,7 +235,7 @@ static EXEC_HDR_TYPE hdr, ohdr;
#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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment