0.8.13.47:

[sbcl.git] / src / runtime / coreparse.c

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 2d03737..a84bc6c 100644 (file)
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -16,6 +16,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -26,15 +27,14 @@
 #include <fcntl.h>
 #endif
 
+#include "sbcl.h"
 #include "os.h"
 #include "runtime.h"
 #include "globals.h"
 #include "core.h"
 #include "arch.h"
 #include "interr.h"
-#include "sbcl.h"
-#include "genesis/symbol.h"
-#include "genesis/static-symbols.h"
+#include "thread.h"
 
 unsigned char build_id[] =
 #include "../../output/build-id.tmp"
@@ -90,11 +90,8 @@ 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(__i386__)
- * ? */
-#if defined(LISP_FEATURE_X86)
-           SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer);
+#if defined(ALLOCATION_POINTER)
+           SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
 #else
            dynamic_space_free_pointer = free_pointer;
 #endif
@@ -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;