1.0.9.45: cleaner & thread-safe pv-table interning

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

diff --git a/src/runtime/save.c b/src/runtime/save.c
index 33f7e36..78a56ad 100644 (file)
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -34,7 +34,7 @@
 #include "genesis/static-symbols.h"
 #include "genesis/symbol.h"
 
-#ifdef LISP_FEATURE_SB_LUTEX
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
 #include "genesis/lutex.h"
 #endif
 
@@ -170,8 +170,8 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end, os_vm_offset_t fil
     scan_for_lutexes((char *)addr, words);
 #endif
 
-    printf("writing %ld bytes from the %s space at 0x%08lx\n",
-           bytes, names[id], (unsigned long)addr);
+    printf("writing %lu bytes from the %s space at 0x%08lx\n",
+           (unsigned long)bytes, names[id], (unsigned long)addr);
 
     data = write_bytes(file, (char *)addr, bytes, file_offset);
 
@@ -230,7 +230,7 @@ save_to_filehandle(FILE *file, char *filename, lispobj init_function,
          file);
     {
         unsigned char *p;
-        for (p = build_id; *p; ++p)
+        for (p = (unsigned char *)build_id; *p; ++p)
             write_lispobj(*p, file);
     }
 
@@ -302,7 +302,7 @@ save_to_filehandle(FILE *file, char *filename, lispobj init_function,
 #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
     if(n_lutexes > 0) {
         long offset;
-        printf("writing %d lutexes to the core...\n", n_lutexes);
+        printf("writing %ld lutexes to the core...\n", n_lutexes);
         write_lispobj(LUTEX_TABLE_CORE_ENTRY_TYPE_CODE, file);
         /* word count of the entry */
         write_lispobj(4, file);