Mercurial > emacs

diff src/s/gnu-linux.h @ 108900:ff2d80da1816

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 03 Jun 2010 22:45:12 +0000
parents 3ff97bad1c47
children d86e65007470
line wrap: on
line diff
--- a/src/s/gnu-linux.h	Wed Jun 02 22:44:58 2010 +0000
+++ b/src/s/gnu-linux.h	Thu Jun 03 22:45:12 2010 +0000
@@ -29,7 +29,6 @@
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "gnu/linux"		/* All the best software is free. */
 
-#ifndef NOT_C_CODE
 #ifdef emacs
 #ifdef HAVE_LINUX_VERSION_H
 #include <linux/version.h>
@@ -40,7 +39,6 @@
 #endif /* LINUX_VERSION_CODE >= 0x20400 */
 #endif /* HAVE_LINUX_VERSION_H */
 #endif /* emacs */
-#endif /* NOT_C_CODE */
 
 #if defined HAVE_GRANTPT
 #define UNIX98_PTYS
@@ -133,8 +131,6 @@
 
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
-#define UNEXEC unexelf.o
-
 /* This is to work around mysterious gcc failures in some system versions.
    It is unlikely that Emacs changes will work around this problem;
    therefore, this should remain permanently.  */