Mercurial > emacs
comparison src/s/gnu-linux.h @ 108900:ff2d80da1816
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 03 Jun 2010 22:45:12 +0000 |
| parents | 3ff97bad1c47 |
| children | d86e65007470 |
comparison
equal
deleted
inserted
replaced
| 108899:f094e7889b4c | 108900:ff2d80da1816 |
|---|---|
| 27 | 27 |
| 28 /* SYSTEM_TYPE should indicate the kind of system you are using. | 28 /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 29 It sets the Lisp variable system-type. */ | 29 It sets the Lisp variable system-type. */ |
| 30 #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ | 30 #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ |
| 31 | 31 |
| 32 #ifndef NOT_C_CODE | |
| 33 #ifdef emacs | 32 #ifdef emacs |
| 34 #ifdef HAVE_LINUX_VERSION_H | 33 #ifdef HAVE_LINUX_VERSION_H |
| 35 #include <linux/version.h> | 34 #include <linux/version.h> |
| 36 | 35 |
| 37 #if LINUX_VERSION_CODE >= 0x20400 | 36 #if LINUX_VERSION_CODE >= 0x20400 |
| 38 /* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works. */ | 37 /* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works. */ |
| 39 #define SIGNALS_VIA_CHARACTERS | 38 #define SIGNALS_VIA_CHARACTERS |
| 40 #endif /* LINUX_VERSION_CODE >= 0x20400 */ | 39 #endif /* LINUX_VERSION_CODE >= 0x20400 */ |
| 41 #endif /* HAVE_LINUX_VERSION_H */ | 40 #endif /* HAVE_LINUX_VERSION_H */ |
| 42 #endif /* emacs */ | 41 #endif /* emacs */ |
| 43 #endif /* NOT_C_CODE */ | |
| 44 | 42 |
| 45 #if defined HAVE_GRANTPT | 43 #if defined HAVE_GRANTPT |
| 46 #define UNIX98_PTYS | 44 #define UNIX98_PTYS |
| 47 | 45 |
| 48 /* Run only once. We need a `for'-loop because the code uses `continue'. */ | 46 /* Run only once. We need a `for'-loop because the code uses `continue'. */ |
| 131 | 129 |
| 132 #define SYSV_SYSTEM_DIR /* use dirent.h */ | 130 #define SYSV_SYSTEM_DIR /* use dirent.h */ |
| 133 | 131 |
| 134 #define POSIX /* affects getpagesize.h and systty.h */ | 132 #define POSIX /* affects getpagesize.h and systty.h */ |
| 135 | 133 |
| 136 #define UNEXEC unexelf.o | |
| 137 | |
| 138 /* This is to work around mysterious gcc failures in some system versions. | 134 /* This is to work around mysterious gcc failures in some system versions. |
| 139 It is unlikely that Emacs changes will work around this problem; | 135 It is unlikely that Emacs changes will work around this problem; |
| 140 therefore, this should remain permanently. */ | 136 therefore, this should remain permanently. */ |
| 141 #ifndef HAVE_XRMSETDATABASE | 137 #ifndef HAVE_XRMSETDATABASE |
| 142 #define HAVE_XRMSETDATABASE | 138 #define HAVE_XRMSETDATABASE |
