diff options
| author | Karoly Lorentey | 2004-07-22 22:01:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-07-22 22:01:29 +0000 |
| commit | 407e382d35ede779a23b974d7ac40a7d3d0fa5ff (patch) | |
| tree | 4a9e97dd58011b0ce2d6223626554765860fd6db /src/s/gnu-linux.h | |
| parent | 31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c (diff) | |
| parent | bb6a9650da7971581f2ddf625c172b58a6806e7a (diff) | |
| download | emacs-407e382d35ede779a23b974d7ac40a7d3d0fa5ff.tar.gz emacs-407e382d35ede779a23b974d7ac40a7d3d0fa5ff.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-461
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-462
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-220
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index efdc2bc00ef..033ce49293a 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -355,7 +355,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 355 | 355 | ||
| 356 | #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ | 356 | #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ |
| 357 | || defined __alpha__ || defined __mips__ || defined __s390__ \ | 357 | || defined __alpha__ || defined __mips__ || defined __s390__ \ |
| 358 | || defined __arm__ || defined __powerpc__ | 358 | || defined __arm__ || defined __powerpc__ || defined __amd64__ |
| 359 | #define GC_SETJMP_WORKS 1 | 359 | #define GC_SETJMP_WORKS 1 |
| 360 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 360 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 361 | #ifdef __mc68000__ | 361 | #ifdef __mc68000__ |