aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorPaul Eggert2011-07-08 02:38:32 -0700
committerPaul Eggert2011-07-08 02:38:32 -0700
commit1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615 (patch)
tree16046f0d8917f94dec1d0a4dc8316e657a00ae1f /src/s
parent8a6ebd580bafa45ca1d8cc6294ea91facacfdbe0 (diff)
parenta63e0781250f31d99360209d9053d380d6fe0815 (diff)
downloademacs-1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615.tar.gz
emacs-1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615.zip
Merge from trunk.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/irix6-5.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index d283571d8fb..26eb7dcde77 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -96,3 +96,10 @@ char *_getpty();
96/* Tested on Irix 6.5. SCM worked on earlier versions. */ 96/* Tested on Irix 6.5. SCM worked on earlier versions. */
97#define GC_SETJMP_WORKS 1 97#define GC_SETJMP_WORKS 1
98#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS 98#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
99
100
101/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
102 were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
103 the value field of a LISP_OBJECT). */
104#define DATA_START 0x10000000
105#define DATA_SEG_BITS 0x10000000