Ticket #549: changes_on_pmc_sans_unionval_branch.patch

src/string/charset/unicode.c

@@ -440 +440 @@
 
     /* 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);
 
     /*

src/gc/alloc_resources.c

@@ -873 +873 @@
 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 +913 @@
     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))
         {

tools/build/nativecall.pl

@@ -405 +405 @@
     /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;";