aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-10-04 10:29:31 +0000
committerKarl Heuer1994-10-04 10:29:31 +0000
commit1681c5f41142ac5786d7eeb99e2fef1d25493f93 (patch)
treeaa65015959ee7bc055a1cb30a2f98fbdadc60584 /src
parentf6c27bd8c3fe5b141940d21027fb35aafc4df762 (diff)
downloademacs-1681c5f41142ac5786d7eeb99e2fef1d25493f93.tar.gz
emacs-1681c5f41142ac5786d7eeb99e2fef1d25493f93.zip
Don't override definition of XSETINT.
(XSETUINT, XSETPNTR): Deleted.
Diffstat (limited to 'src')
-rw-r--r--src/m/hp800.h3
-rw-r--r--src/m/iris4d.h4
-rw-r--r--src/m/iris5d.h4
-rw-r--r--src/m/mips.h4
4 files changed, 0 insertions, 15 deletions
diff --git a/src/m/hp800.h b/src/m/hp800.h
index dd5eb84f2b1..345541ff29e 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -141,9 +141,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
141#define XSET(var, type, ptr) \ 141#define XSET(var, type, ptr) \
142 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) 142 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS))
143 143
144#define XSETINT(a, b) XSET(a, XTYPE(a), b)
145#define XSETUINT(a, b) XSET(a, XTYPE(a), b)
146#define XSETPNTR(a, b) XSET(a, XTYPE(a), b)
147#define XMARKBIT(a) ((a) < 0) 144#define XMARKBIT(a) ((a) < 0)
148#define XSETMARKBIT(a,b) ((a) = ((b) ? (a)|MARKBIT : (a) & ~MARKBIT)) 145#define XSETMARKBIT(a,b) ((a) = ((b) ? (a)|MARKBIT : (a) & ~MARKBIT))
149 146
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 420092e81e1..efe6089d17d 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -181,10 +181,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
181#define XSET(var, type, ptr) \ 181#define XSET(var, type, ptr) \
182 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) 182 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS))
183 183
184#define XSETINT(a, b) XSET(a, XTYPE(a), b)
185#define XSETUINT(a, b) XSET(a, XTYPE(a), b)
186#define XSETPNTR(a, b) XSET(a, XTYPE(a), b)
187
188#define XMARKBIT(a) ((a) < 0) 184#define XMARKBIT(a) ((a) < 0)
189#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) 185#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
190#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS)) 186#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS))
diff --git a/src/m/iris5d.h b/src/m/iris5d.h
index a8e0bf0c02d..58f18e8350a 100644
--- a/src/m/iris5d.h
+++ b/src/m/iris5d.h
@@ -182,10 +182,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
182#define XSET(var, type, ptr) \ 182#define XSET(var, type, ptr) \
183 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) 183 ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS))
184 184
185#define XSETINT(a, b) XSET(a, XTYPE(a), b)
186#define XSETUINT(a, b) XSET(a, XTYPE(a), b)
187#define XSETPNTR(a, b) XSET(a, XTYPE(a), b)
188
189#define XMARKBIT(a) ((a) < 0) 185#define XMARKBIT(a) ((a) < 0)
190#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) 186#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
191#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS)) 187#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS))
diff --git a/src/m/mips.h b/src/m/mips.h
index 143579200a0..690a13b9eae 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -176,10 +176,6 @@ NOTE-END */
176 ((int)(type) << VALBITS) \ 176 ((int)(type) << VALBITS) \
177 + (((unsigned) (ptr) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS))) 177 + (((unsigned) (ptr) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS)))
178 178
179#define XSETINT(a, b) XSET(a, XTYPE(a), b)
180#define XSETUINT(a, b) XSET(a, XTYPE(a), b)
181#define XSETPNTR(a, b) XSET(a, XTYPE(a), b)
182
183#define XUNMARK(a) \ 179#define XUNMARK(a) \
184 ((a) = \ 180 ((a) = \
185 (((unsigned)(a) << (INTBITS-GCTYPEBITS-VALBITS)) \ 181 (((unsigned)(a) << (INTBITS-GCTYPEBITS-VALBITS)) \