### Eclipse Workspace Patch 1.0 #P pmc_sans_unionval Index: src/string/charset/unicode.c =================================================================== --- src/string/charset/unicode.c (revision 40556) +++ src/string/charset/unicode.c (working copy) @@ -440,7 +440,7 @@ /* use all available space - see below XXX */ /* TODO downcase, titlecase too */ - dest_len = PObj_buflen(src) / sizeof (UChar); + dest_len = Buffer_buflen(src) / sizeof (UChar); src_len = src->bufused / sizeof (UChar); /* Index: src/gc/alloc_resources.c =================================================================== --- src/gc/alloc_resources.c (revision 40556) +++ src/gc/alloc_resources.c (working copy) @@ -873,9 +873,10 @@ check_memory_pool(Memory_Pool *pool) { size_t count; + Memory_Block * block_walker; count = 10000000; /*detect unendless loop just use big enough number*/ - Memory_Block * block_walker = (Memory_Block *)pool->top_block; + block_walker = (Memory_Block *)pool->top_block; while(block_walker != NULL) { PARROT_ASSERT(block_walker->start == (char *)block_walker + sizeof (Memory_Block)); @@ -912,7 +913,7 @@ if(bufstart == NULL && Buffer_buflen(pobj) == 0) return; - if(PObj_external_TEST(pobj)) /*buffer does not come from the memory pool*/ + if(PObj_external_TEST(pobj) || PObj_sysmem_TEST(pobj)) /*buffer does not come from the memory pool*/ { if (PObj_is_string_TEST(pobj)) { Index: tools/build/nativecall.pl =================================================================== --- tools/build/nativecall.pl (revision 40556) +++ tools/build/nativecall.pl (working copy) @@ -405,7 +405,7 @@ /b/ && do { push @{$temps_ref}, "STRING *t_$temp_num;"; push @{$extra_preamble_ref}, "t_$temp_num = GET_NCI_S($reg_num);"; - return "PObj_bufstart(t_$temp_num)"; + return "Buffer_bufstart(t_$temp_num)"; }; /B/ && do { push @{$temps_ref}, "char *s_$temp_num;\n char *t_$temp_num;\n void** v_$temp_num = (void **) &t_$temp_num;";