From 46ecd939368d0ad3a38dabd2a2d68421794b9636 Mon Sep 17 00:00:00 2001
From: agoncharov <agoncharov>
Date: Fri, 18 Dec 2009 04:03:24 +0000
Subject: [PATCH] of (FresBSD+) Get rid of gcc warnings: int != ulong; char
 *strdup() != int strdup; lisp space

---
 lisp/gencgc.c       | 14 +++++++-------
 lisp/lisp.c         |  6 +++---
 lisp/save.c         |  3 ++-
 lisp/x86-validate.h | 12 ++++++------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lisp/gencgc.c b/lisp/gencgc.c
index c65c1bd7b..a4923aeb8 100644
--- a/lisp/gencgc.c
+++ b/lisp/gencgc.c
@@ -7,7 +7,7 @@
  *
  * Douglas Crosher, 1996, 1997, 1998, 1999.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/gencgc.c,v 1.104 2009/12/17 15:53:45 rtoy Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/gencgc.c,v 1.105 2009/12/18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -2037,7 +2037,7 @@ other_space_p(lispobj obj)
         in_space = TRUE;
     }
 #elif defined(i386)
-#if defined(DARWIN) || defined(__linux__)
+#if defined(DARWIN) || defined(__linux__) || defined(__FreeBSD__)
     /*
      * For x86, we see some object at 0xffffffe9.  I (rtoy) am not
      * sure that is, but it clearly can't be in malloc space so we
@@ -2520,12 +2520,12 @@ scavenge(void *start_obj, long nwords)
                 fprintf(stderr, "Not in Lisp spaces:  object = %p, ptr = %p\n", (void*)object, ptr);
                 if (1) {
                     lispobj header = *ptr;
-                    fprintf(stderr, "  Header value = 0x%x\n", header);
+                    fprintf(stderr, "  Header value = 0x%lx\n", (unsigned long) header);
                     if (maybe_static_array_p(header)) {
                         int static_p;
 
-                        fprintf(stderr, "Possible static vector at %p.  header = 0x%x\n",
-                                ptr, header);
+                        fprintf(stderr, "Possible static vector at %p.  header = 0x%lx\n",
+                                ptr, (unsigned long) header);
                       
                         static_p = (HeaderValue(header) & 1) == 1;
                         if (static_p) {
@@ -2534,8 +2534,8 @@ scavenge(void *start_obj, long nwords)
                              * reachable by setting the MSB of the header.
                              */
                             *ptr = header | 0x80000000;
-                            fprintf(stderr, "Scavenged static vector @%p, header = 0x%x\n",
-                                    ptr, header);
+                            fprintf(stderr, "Scavenged static vector @%p, header = 0x%lx\n",
+                                    ptr, (unsigned long) header);
                       
                         }
                     }
diff --git a/lisp/lisp.c b/lisp/lisp.c
index 27ad22179..4c568fbeb 100644
--- a/lisp/lisp.c
+++ b/lisp/lisp.c
@@ -1,7 +1,7 @@
 /*
  * main() entry point for a stand alone lisp image.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.68 2009/07/13 19:41:54 rtoy Rel $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.69 2009/12/18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -519,8 +519,8 @@ main(int argc, const char *argv[], const char *envp[])
 #endif
 	    if (dynamic_space_size > DYNAMIC_SPACE_SIZE) {
 		fprintf(stderr,
-			"-dynamic-space-size must be no greater than %d MBytes.\n",
-			DYNAMIC_SPACE_SIZE / (1024 * 1024));
+			"-dynamic-space-size must be no greater than %lu MBytes.\n",
+			DYNAMIC_SPACE_SIZE / (1024 * 1024UL));
 		exit(1);
 	    }
 	} else if (strcmp(arg, "-monitor") == 0) {
diff --git a/lisp/save.c b/lisp/save.c
index 484147870..bdc8df4c4 100644
--- a/lisp/save.c
+++ b/lisp/save.c
@@ -1,6 +1,6 @@
 /*
 
- $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/save.c,v 1.22 2009/09/28 12:32:42 rtoy Rel $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/save.c,v 1.23 2009/12/18 04:03:24 agoncharov Exp $
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "lisp.h"
 #include "os.h"
diff --git a/lisp/x86-validate.h b/lisp/x86-validate.h
index dc83179bb..c3fc92595 100644
--- a/lisp/x86-validate.h
+++ b/lisp/x86-validate.h
@@ -3,7 +3,7 @@
  * This code was written as part of the CMU Common Lisp project at
  * Carnegie Mellon University, and has been placed in the public domain.
  *
- *  $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-validate.h,v 1.28 2007/07/06 08:04:39 cshapiro Rel $
+ *  $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-validate.h,v 1.29 2009/12/18 04:03:24 agoncharov Exp $
  *
  */
 
@@ -82,16 +82,16 @@
 #define SIGNAL_STACK_START	0x47fd8000
 #define SIGNAL_STACK_SIZE	SIGSTKSZ
 
-#define DYNAMIC_0_SPACE_START	(0x48000000)
+#define DYNAMIC_0_SPACE_START	(0x48000000UL)
 #ifdef GENCGC
-#define DYNAMIC_SPACE_SIZE	(0x78000000)	/* May be up to 1.7 GB */
+#define DYNAMIC_SPACE_SIZE	(0x78000000UL)	/* May be up to 1.7 GB */
 #else
-#define DYNAMIC_SPACE_SIZE	(0x04000000)	/* 64MB */
+#define DYNAMIC_SPACE_SIZE	(0x04000000UL)	/* 64MB */
 #endif
-#define DEFAULT_DYNAMIC_SPACE_SIZE	(0x20000000)	/* 512MB */
+#define DEFAULT_DYNAMIC_SPACE_SIZE	(0x20000000UL)	/* 512MB */
 #ifdef LINKAGE_TABLE
 #define FOREIGN_LINKAGE_SPACE_START ((unsigned long) LinkageSpaceStart)
-#define FOREIGN_LINKAGE_SPACE_SIZE (0x100000)	/* 1MB */
+#define FOREIGN_LINKAGE_SPACE_SIZE (0x100000UL)	/* 1MB */
 #endif
 #endif /* __FreeBSD__ */
 
-- 
GitLab