X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/db0406bb64f7e5dceeb257c7e350f1e80ed9c1c1..c43fb4c32df6393a3e001151693b8ce28f860976:/src/s/gnu-linux.h
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 178d7082f7..b4031bb1ca 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,6 @@
/* This file is the configuration file for Linux-based GNU systems
-Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2011
+Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012
Free Software Foundation, Inc.
This file was put together by Michael K. Johnson and Rik Faith.
@@ -25,21 +25,6 @@ along with GNU Emacs. If not, see . */
#define USG
#define GNU_LINUX
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-#define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */
-
-#ifdef emacs
-#ifdef HAVE_LINUX_VERSION_H
-#include
-
-#if LINUX_VERSION_CODE >= 0x20400
-/* 21 Jun 06: Eric Hanchrow says this works. */
-#define SIGNALS_VIA_CHARACTERS
-#endif /* LINUX_VERSION_CODE >= 0x20400 */
-#endif /* HAVE_LINUX_VERSION_H */
-#endif /* emacs */
-
#if defined HAVE_GRANTPT
#define UNIX98_PTYS
@@ -67,8 +52,7 @@ along with GNU Emacs. If not, see . */
close (fd); \
return -1; \
} \
- strncpy (pty_name, ptyname, sizeof (pty_name)); \
- pty_name[sizeof (pty_name) - 1] = 0; \
+ snprintf (pty_name, sizeof pty_name, "%s", ptyname); \
sigunblock (sigmask (SIGCHLD)); \
}
@@ -85,14 +69,6 @@ along with GNU Emacs. If not, see . */
#define HAVE_SOCKETS
-/* This is used in list_system_processes. */
-#define HAVE_PROCFS 1
-
-/* 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
-
/* Here, on a separate page, add any special hacks needed
to make Emacs work on this system. For example,
you might define certain system call names that don't
@@ -100,26 +76,6 @@ along with GNU Emacs. If not, see . */
your system and must be used only through an encapsulation
(Which you should place, by convention, in sysdep.c). */
-/* This is needed for dispnew.c:update_frame. */
-#ifdef emacs
-#include /* Get the definition of _IO_STDIO_H. */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
-/* New C libio names. */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
- ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
-#elif defined (__UCLIBC__)
-/* Using the uClibc library. */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
- ((FILE)->__bufpos - (FILE)->__bufstart)
-#else /* !_IO_STDIO_H && ! __UCLIBC__ */
-/* Old C++ iostream names. */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
- ((FILE)->_pptr - (FILE)->_pbase)
-#endif /* !_IO_STDIO_H && ! __UCLIBC__ */
-
-#define INTERRUPT_INPUT
-#endif /* emacs */
-
#define POSIX /* affects getpagesize.h and systty.h */
/* This is to work around mysterious gcc failures in some system versions.
@@ -145,17 +101,21 @@ along with GNU Emacs. If not, see . */
|| defined __arm__ || defined __powerpc__ || defined __amd64__ \
|| defined __ia64__ || defined __sh__
#define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-#ifdef __mc68000__
-#define GC_LISP_OBJECT_ALIGNMENT 2
-#endif
#ifdef __ia64__
#define GC_MARK_SECONDARY_STACK() \
do { \
extern void *__libc_ia64_register_backing_store_base; \
__builtin_ia64_flushrs (); \
mark_memory (__libc_ia64_register_backing_store_base, \
- __builtin_ia64_bsp (), 0); \
+ __builtin_ia64_bsp ()); \
} while (0)
#endif
+#else
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
+#endif
+
+#ifdef __i386__
+/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
+/* we cannot get the maximum address for brk */
+# define ULIMIT_BREAK_VALUE (32*1024*1024)
#endif