diff src/mem-limits.h @ 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.

--- 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;