X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=887b8898e8e9cbe88566a8d93417cff9827e445e;hb=3fe0010d2777b41e01ea9b4a0f894cfa40f7df1b;hp=5cb6c647360725311b122d5ea84f82fc2814567c;hpb=8c81c0972f9e70f124b57394b5be29d9e661a0c7;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 5cb6c64..887b889 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -90,10 +90,7 @@ process_directory(int fd, u32 *ptr, int count)
 		lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
 	    }
 #endif
-/* FIXME: Should the conditional here be reg_ALLOC instead of
- *   defined(LISP_FEATURE_X86)
- * ? */
-#if defined(LISP_FEATURE_X86)
+#if defined(ALLOCATION_POINTER)
 	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
 #else
 	    dynamic_space_free_pointer = free_pointer;
@@ -127,7 +124,7 @@ process_directory(int fd, u32 *ptr, int count)
 lispobj
 load_core_file(char *file)
 {
-    u32 *header, val, len, *ptr, remaining_len;
+    lispobj *header, val, len, *ptr, remaining_len;
     int fd = open(file, O_RDONLY), count;
 
     lispobj initial_function = NIL;
@@ -212,7 +209,7 @@ load_core_file(char *file)
 	    SHOW("NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE case");
 	    process_directory(fd,
 			      ptr,
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
 			      remaining_len / (sizeof(struct ndir_entry) /
 					       sizeof(long))
 #else