diff --git a/ase/stx/misc.h b/ase/stx/misc.h index 7dd4fc2e..6797912c 100644 --- a/ase/stx/misc.h +++ b/ase/stx/misc.h @@ -1,5 +1,5 @@ /* - * $Id: misc.h,v 1.2 2005-05-19 16:41:10 bacon Exp $ + * $Id: misc.h,v 1.3 2005-05-21 07:27:32 bacon Exp $ */ #ifndef _XP_STX_MISC_H_ @@ -11,6 +11,7 @@ #include #include #include + #include #define xp_stx_assert assert #define xp_stx_malloc malloc diff --git a/ase/stx/object.c b/ase/stx/object.c index 6056f9f1..c3acfdc8 100644 --- a/ase/stx/object.c +++ b/ase/stx/object.c @@ -1,5 +1,5 @@ /* - * $Id: object.c,v 1.17 2005-05-19 16:41:10 bacon Exp $ + * $Id: object.c,v 1.18 2005-05-21 07:27:32 bacon Exp $ */ #include @@ -110,7 +110,7 @@ xp_stx_word_t xp_stx_new_class (xp_stx_t* stx, const xp_stx_char_t* name) meta = xp_stx_alloc_object (stx, XP_STX_CLASS_SIZE); XP_STX_CLASS(stx,meta) = stx->class_metaclass; - XP_STX_AT(stx,meta,XP_STX_CLASS_SIZE) = + XP_STX_AT(stx,meta,XP_STX_CLASS_SPEC) = XP_STX_TO_SMALLINT(XP_STX_CLASS_SIZE); class = xp_stx_alloc_object (stx, XP_STX_CLASS_SIZE); diff --git a/ase/stx/stx.c b/ase/stx/stx.c index a829eee0..55e017c8 100644 --- a/ase/stx/stx.c +++ b/ase/stx/stx.c @@ -1,5 +1,5 @@ /* - * $Id: stx.c,v 1.21 2005-05-19 16:41:10 bacon Exp $ + * $Id: stx.c,v 1.22 2005-05-21 07:27:32 bacon Exp $ */ #include @@ -64,7 +64,8 @@ int xp_stx_bootstrap (xp_stx_t* stx) XP_STX_CLASS(stx,stx->smalltalk) = xp_stx_new_class (stx, XP_STX_TEXT("SystemDictionary")); - symbol_Smalltalk = xp_stx_new_symbol (stx, XP_STX_TEXT("Smalltalk")); + symbol_Smalltalk = + xp_stx_new_symbol (stx, XP_STX_TEXT("Smalltalk")); xp_stx_hash_insert (stx, stx->smalltalk, xp_stx_hash_string_object(stx,symbol_Smalltalk), symbol_Smalltalk, stx->smalltalk); diff --git a/ase/test/stx/stx.c b/ase/test/stx/stx.c index 94bbc845..473fe6c1 100644 --- a/ase/test/stx/stx.c +++ b/ase/test/stx/stx.c @@ -28,10 +28,12 @@ int xp_main (int argc, xp_char_t* argv[]) xp_stx_t stx; xp_stx_word_t i; +#ifndef _DOS if (xp_setlocale () == -1) { printf ("cannot set locale\n"); return -1; } +#endif if (argc != 2) { /* TODO: argument processing */ xp_printf (XP_TEXT("Usage: %s [-f imageFile] MainClass\n"), argv[0]);