From 943fe1b6cf36de2f94f4db8cb5928335388b476c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sun, 4 Nov 2007 21:24:08 -0500
Subject: [PATCH] Deploy tool fixes

---
 core/alien/c-types/c-types.factor           | 2 +-
 extra/tools/deploy/shaker/shaker.factor     | 1 +
 extra/tools/deploy/shaker/strip-libc.factor | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/alien/c-types/c-types.factor b/core/alien/c-types/c-types.factor
index 234e6ef65b..f35981ce77 100644
--- a/core/alien/c-types/c-types.factor
+++ b/core/alien/c-types/c-types.factor
@@ -29,7 +29,7 @@ TUPLE: no-c-type name ;
         dup string? [ (c-type) ] when
     ] when ;
 
-GENERIC: c-type ( name -- type )
+GENERIC: c-type ( name -- type ) foldable
 
 : resolve-pointer-type ( name -- name )
     c-types get at dup string?
diff --git a/extra/tools/deploy/shaker/shaker.factor b/extra/tools/deploy/shaker/shaker.factor
index 4b20c3f0ee..5dee50398c 100644
--- a/extra/tools/deploy/shaker/shaker.factor
+++ b/extra/tools/deploy/shaker/shaker.factor
@@ -16,6 +16,7 @@ IN: tools.deploy.shaker
 : strip-init-hooks ( -- )
     "Stripping startup hooks" show
     "command-line" init-hooks get delete-at
+    "mallocs" init-hooks get delete-at
     strip-io? [ "io.backend" init-hooks get delete-at ] when ;
 
 : strip-debugger ( -- )
diff --git a/extra/tools/deploy/shaker/strip-libc.factor b/extra/tools/deploy/shaker/strip-libc.factor
index f62b4b5935..898399b092 100644
--- a/extra/tools/deploy/shaker/strip-libc.factor
+++ b/extra/tools/deploy/shaker/strip-libc.factor
@@ -6,3 +6,5 @@ IN: libc
 : free (free) ;
 
 : realloc (realloc) ;
+
+: calloc (calloc) ;