malloc.h fixes for darwin, plus a handful of other small fixes for

problems found after fixing malloc problems

3 files changed, 24 insertions, 13 deletions

diff --git a/lang/tinyscheme/distinfo b/lang/tinyscheme/distinfo
index 3c1c824ca76..cb4eae7b127 100644
--- a/lang/tinyscheme/distinfo
+++ b/lang/tinyscheme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/04/08 15:47:49 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (tinyscheme-1.33.tar.gz) = c596b428487c001d31f812137673a2683b352fae
 Size (tinyscheme-1.33.tar.gz) = 52733 bytes
-SHA1 (patch-aa) = d5e9006396c3d894f78a56a49b0d67bf18a1b6f2
-SHA1 (patch-ab) = 4c0a07947323410c26760128ba86cac99a662549
+SHA1 (patch-aa) = 8760042198cbcc202106d0840a6b4627ab599cd0
+SHA1 (patch-ab) = fc6ce2db6fd4344daebd7a9c7e5562179eee17d0
diff --git a/lang/tinyscheme/patches/patch-aa b/lang/tinyscheme/patches/patch-aa
index 7dc6a691c3d..8c55d971f42 100644
--- a/lang/tinyscheme/patches/patch-aa
+++ b/lang/tinyscheme/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/10/30 07:56:09 agc Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/23 23:28:29 danw Exp $
 
 --- makefile	2002/10/24 09:41:47	1.1
 +++ makefile	2002/10/24 09:42:36
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/30 07:56:09 agc Exp $
  
  scheme$(EXE_EXT): $(OBJS) 
 -	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS) 
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT}
++	${LIBTOOL} --mode=link ${CC} ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT}
  
  $(STATICLIBTARGET): $(OBJS)
 -	$(AR) $@ $(OBJS)
diff --git a/lang/tinyscheme/patches/patch-ab b/lang/tinyscheme/patches/patch-ab
index e729a174471..95f5515dcc8 100644
--- a/lang/tinyscheme/patches/patch-ab
+++ b/lang/tinyscheme/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
 
---- scheme.c.orig	2003-01-07 20:40:51.000000000 +0100
-+++ scheme.c	2004-04-08 17:40:03.000000000 +0200
-@@ -91,8 +91,16 @@
+--- scheme.c.orig	Tue Jan  7 14:40:51 2003
++++ scheme.c
+@@ -57,9 +57,7 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-#ifndef macintosh
+-# include <malloc.h>
+-#else
++#ifdef macintosh
+ static int stricmp(const char *s1, const char *s2)
+ {
+   unsigned char c1, c2;
+@@ -91,8 +89,16 @@ static const char *strlwr(char *s) {
  # define prompt "> "
  #endif
  
@@ -20,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
  #endif
  
  #ifndef FIRST_CELLSEGS
-@@ -569,7 +577,7 @@
+@@ -569,7 +575,7 @@ static int alloc_cellseg(scheme *sc, int
  	  i = ++sc->last_cell_seg ;
  	  sc->alloc_seg[i] = cp;
  	  /* adjust in TYPE_BITS-bit boundary */
@@ -29,7 +40,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
  	    cp=(char*)(adj*((long)cp/adj+1));
  	  }
          /* insert new segment in address order */
-@@ -2055,7 +2063,7 @@
+@@ -2055,7 +2061,7 @@ struct dump_stack_frame { 
  
  static void s_save(scheme *sc, enum scheme_opcodes op, pointer args, pointer code) 
  { 
@@ -38,7 +49,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
    struct dump_stack_frame *next_frame; 
  
    /* enough room for the next frame? */ 
-@@ -2075,7 +2083,7 @@
+@@ -2075,7 +2081,7 @@ static void s_save(scheme *sc, enum sche
  
  static pointer _s_return(scheme *sc, pointer a) 
  { 
@@ -47,7 +58,7 @@ $NetBSD: patch-ab,v 1.2 2004/04/08 15:47:49 kristerw Exp $
    struct dump_stack_frame *frame; 
  
    sc->value = (a); 
-@@ -2115,7 +2123,7 @@
+@@ -2115,7 +2121,7 @@ static void dump_stack_free(scheme *sc) 
  
  static INLINE void dump_stack_mark(scheme *sc) 
  {