From c973b929f5146b6fb9b0180307ddbce442d97e1a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.local>
Date: Tue, 25 Aug 2009 05:10:41 -0500
Subject: [PATCH] alien.marshall: fix unit tests

---
 extra/alien/marshall/marshall.factor            | 4 ++--
 extra/alien/marshall/syntax/syntax-tests.factor | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extra/alien/marshall/marshall.factor b/extra/alien/marshall/marshall.factor
index 547e37f78a..d861178fad 100644
--- a/extra/alien/marshall/marshall.factor
+++ b/extra/alien/marshall/marshall.factor
@@ -93,7 +93,7 @@ ALIAS: marshall-void* marshall-pointer
 
 : primitive-marshaller ( type -- quot/f )
     {
-        { "bool"        [ [ marshall-bool ] ] }
+        { "bool"        [ [ ] ] }
         { "boolean"     [ [ marshall-bool ] ] }
         { "char"        [ [ marshall-primitive ] ] }
         { "uchar"       [ [ marshall-primitive ] ] }
@@ -179,7 +179,7 @@ ALIAS: marshall-void* marshall-pointer
 
 : primitive-unmarshaller ( type -- quot/f )
     {
-        { "bool"       [ [ unmarshall-bool ] ] }
+        { "bool"       [ [ ] ] }
         { "boolean"    [ [ unmarshall-bool ] ] }
         { "char"       [ [ ] ] }
         { "uchar"      [ [ ] ] }
diff --git a/extra/alien/marshall/syntax/syntax-tests.factor b/extra/alien/marshall/syntax/syntax-tests.factor
index 68e6f7aff8..437685137c 100644
--- a/extra/alien/marshall/syntax/syntax-tests.factor
+++ b/extra/alien/marshall/syntax/syntax-tests.factor
@@ -9,9 +9,7 @@ C-LIBRARY: test
 
 C-INCLUDE: <stdlib.h>
 C-INCLUDE: <string.h>
-
-! This used to typedef 'bool' but that's bad for PowerPC where its really an int
-C-TYPEDEF: char mybool
+C-INCLUDE: <stdbool.h>
 
 CM-FUNCTION: void outarg1 ( int* a )
     *a += 2;
@@ -39,7 +37,7 @@ CM-FUNCTION: void change_time ( double hours, sundial* d )
     d->wedge.degrees = hours * 30;
 ;
 
-CM-FUNCTION: mybool c_not ( mybool p )
+CM-FUNCTION: bool c_not ( bool p )
     return !p;
 ;