X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=00a24f1108e931543d72c268821b56d0840c4644;hb=cd2c70c8b5d4dcc62b968f5a9bedd3c9c8698e82;hp=0e0a438efa12e270c0b7ee35bcc0ae1710846f70;hpb=1e4629723d19f96d752235ffde34fe58431431ae;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 0e0a438..00a24f1 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -30,7 +30,7 @@
 
 #define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
 
-#if defined GENCGC
+#if defined LISP_FEATURE_GENCGC
 extern lispobj *alloc(int bytes);
 #else
 static lispobj *
@@ -74,7 +74,7 @@ alloc_vector(int type, int length, int size)
     result->header = type;
     result->length = make_fixnum(length);
 
-    return ((lispobj)result)|OTHER_POINTER_LOWTAG;
+    return make_lispobj(result,OTHER_POINTER_LOWTAG);
 }
 
 lispobj
@@ -85,7 +85,7 @@ alloc_cons(lispobj car, lispobj cdr)
     ptr->car = car;
     ptr->cdr = cdr;
 
-    return (lispobj)ptr | LIST_POINTER_LOWTAG;
+    return make_lispobj(ptr, LIST_POINTER_LOWTAG);
 }
 
 lispobj
@@ -100,7 +100,7 @@ alloc_number(long n)
 
         ptr->digits[0] = n;
 
-	return (lispobj) ptr | OTHER_POINTER_LOWTAG;
+	return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
     }
 }
 
@@ -124,5 +124,5 @@ alloc_sap(void *ptr)
     sap=(struct sap *)
 	alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
     sap->pointer = ptr;
-    return (lispobj) sap | OTHER_POINTER_LOWTAG;
+    return make_lispobj(sap,OTHER_POINTER_LOWTAG);
 }