diff options
| author | Karoly Lorentey | 2006-06-27 15:06:36 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-06-27 15:06:36 +0000 |
| commit | 556b89447234f15d1784a23dadbfe429464463a8 (patch) | |
| tree | d5b94bbdde7b399bb0ffdf03a01f3e8398ee0afa /src/s/gnu-linux.h | |
| parent | 476e9367ec1f440aa23904b7bc482ea4a3b8041c (diff) | |
| parent | 08b1eb21d5a3f935eb245acf0844a19acc42f57c (diff) | |
| download | emacs-556b89447234f15d1784a23dadbfe429464463a8.tar.gz emacs-556b89447234f15d1784a23dadbfe429464463a8.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-305
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-306
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-307
Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.
* emacs@sv.gnu.org/emacs--devo--0--patch-308
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-309
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-310
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-311
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-312
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-313
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-314
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-315
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-316
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-317
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-318
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-319
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-320
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-321
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-322
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-323
lisp/play/cookie1.el (cookie): Work properly when there's only one entry
* emacs@sv.gnu.org/emacs--devo--0--patch-324
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-325
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-326
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-327
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-328
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-329
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-330
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-105
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-106
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-107
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-108
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-109
Clean up merge mistakes
* emacs@sv.gnu.org/gnus--rel--5.10--patch-110
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-571
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 4ef3db9f2ea..5d247a1c9c8 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -52,6 +52,9 @@ Boston, MA 02110-1301, USA. */ | |||
| 52 | #if LINUX_VERSION_CODE >= 0x20000 | 52 | #if LINUX_VERSION_CODE >= 0x20000 |
| 53 | #define LINUX_MAP_SHARED_DOES_WORK | 53 | #define LINUX_MAP_SHARED_DOES_WORK |
| 54 | #endif /* LINUX_VERSION_CODE >= 0x20000 */ | 54 | #endif /* LINUX_VERSION_CODE >= 0x20000 */ |
| 55 | #if LINUX_VERSION_CODE >= 0x20400 | ||
| 56 | #define LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK | ||
| 57 | #endif /* LINUX_VERSION_CODE >= 0x20400 */ | ||
| 55 | #endif /* HAVE_LINUX_VERSION_H */ | 58 | #endif /* HAVE_LINUX_VERSION_H */ |
| 56 | #endif /* emacs */ | 59 | #endif /* emacs */ |
| 57 | #endif /* NOT_C_CODE */ | 60 | #endif /* NOT_C_CODE */ |
| @@ -247,9 +250,9 @@ Boston, MA 02110-1301, USA. */ | |||
| 247 | #define C_DEBUG_SWITCH | 250 | #define C_DEBUG_SWITCH |
| 248 | #endif | 251 | #endif |
| 249 | 252 | ||
| 250 | /* Let's try this out, just in case. | 253 | #ifdef LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK |
| 251 | Nah. Rik Faith <faith@cs.unc.edu> says it doesn't work well. */ | 254 | #define SIGNALS_VIA_CHARACTERS |
| 252 | /* #define SIGNALS_VIA_CHARACTERS */ | 255 | #endif |
| 253 | 256 | ||
| 254 | /* Rob Malouf <malouf@csli.stanford.edu> says: | 257 | /* Rob Malouf <malouf@csli.stanford.edu> says: |
| 255 | SYSV IPC is standard a standard part of Linux since version 0.99pl10, | 258 | SYSV IPC is standard a standard part of Linux since version 0.99pl10, |