From 3443acd61acfd3ad938a75b2caaa19ff20abbae6 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 23 Jan 2008 01:59:22 +0000
Subject: [PATCH] GC and header fixes from Andrew Reilly

svn: r8385
---
 src/foreign/README                          | 2 ++
 src/foreign/gcc/libffi/include/ffi_common.h | 2 +-
 src/mzscheme/gc2/newgc.c                    | 4 ++--
 src/wxxt/contrib/xpm/lib/xpmP.h             | 2 +-
 src/wxxt/src/XWidgets/xwArrow.c             | 1 +
 src/wxxt/src/XWidgets/xwArrow.w             | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/foreign/README b/src/foreign/README
index 21e09da152..41978914d3 100644
--- a/src/foreign/README
+++ b/src/foreign/README
@@ -16,3 +16,5 @@ ways:
  * Added case in "configure" sparc64-*-freebsd* to existing sparc64 line
 
  * Added case in "configure" x86_64-*-openbsd* to the existing x86_64 line
+
+ * Changed ffi_common.h to always include <string.h>
diff --git a/src/foreign/gcc/libffi/include/ffi_common.h b/src/foreign/gcc/libffi/include/ffi_common.h
index da15ab8ec6..5ef7990dbb 100644
--- a/src/foreign/gcc/libffi/include/ffi_common.h
+++ b/src/foreign/gcc/libffi/include/ffi_common.h
@@ -33,7 +33,7 @@ char *alloca ();
 #endif
 
 /* Check for the existence of memcpy. */
-#if STDC_HEADERS
+#if 1 || STDC_HEADERS
 # include <string.h>
 #else
 # ifndef HAVE_MEMCPY
diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c
index 5672b90dc3..331f965eae 100644
--- a/src/mzscheme/gc2/newgc.c
+++ b/src/mzscheme/gc2/newgc.c
@@ -291,13 +291,13 @@ inline static struct mpage **create_page_map(void *p) {
   pos = (unsigned long)p >> 48;
   page_maps = page_mapss[pos];
   if (!page_maps) {
-    page_maps = (struct mpage ***)malloc(sizeof(struct mpage **) * (1 << 16));
+    page_maps = (struct mpage ***)calloc(1 << 16, sizeof(struct mpage **));
     page_mapss[pos] = page_maps;
   }
   pos = ((unsigned long)p >> 32) & ((1 << 16) - 1);
   page_map = page_maps[pos];
   if (!page_map) {
-    page_map = (struct mpage **)malloc(sizeof(struct mpage *) * (1 << USEFUL_ADDR_BITS));
+    page_map = (struct mpage **)calloc(1 << USEFUL_ADDR_BITS, sizeof(struct mpage *));
     page_maps[pos] = page_map;
   }
   return page_map;
diff --git a/src/wxxt/contrib/xpm/lib/xpmP.h b/src/wxxt/contrib/xpm/lib/xpmP.h
index 5e7e47807e..de7cccac9d 100644
--- a/src/wxxt/contrib/xpm/lib/xpmP.h
+++ b/src/wxxt/contrib/xpm/lib/xpmP.h
@@ -53,7 +53,7 @@
 extern FILE *popen();
 #endif
 
-#if defined(SYSV) || defined(SVR4) || defined(VMS)
+#if defined(__FreeBSD__) || defined(SYSV) || defined(SVR4) || defined(VMS)
 #include <string.h>
 
 #ifndef index
diff --git a/src/wxxt/src/XWidgets/xwArrow.c b/src/wxxt/src/XWidgets/xwArrow.c
index b83621ef8b..649b033520 100644
--- a/src/wxxt/src/XWidgets/xwArrow.c
+++ b/src/wxxt/src/XWidgets/xwArrow.c
@@ -8,6 +8,7 @@
 #include <assert.h>
 #include <wxtimeout.h>
 #include "xwTools3d.h"
+#include "xwTabString.h"
 #include <./xwArrowP.h>
 static void activate_and_start_timer(
 #if NeedFunctionPrototypes
diff --git a/src/wxxt/src/XWidgets/xwArrow.w b/src/wxxt/src/XWidgets/xwArrow.w
index 6a8d818077..27557c2068 100644
--- a/src/wxxt/src/XWidgets/xwArrow.w
+++ b/src/wxxt/src/XWidgets/xwArrow.w
@@ -416,3 +416,4 @@ resource. It is the same routine as for the shadows in the XfwfFrame widget.
 @incl <assert.h>
 @incl <wxtimeout.h>
 @incl "xwTools3d.h"
+@incl "xwTabString.h"