[svn:parrot] r45890 - branches/avl_string_cache/src/packfile

[bacek at svn.parrot.org]

Author: bacek
Date: Thu Apr 22 10:01:11 2010
New Revision: 45890
URL: https://trac.parrot.org/parrot/changeset/45890

Log:
Properly fix merge conflict.

Modified:
   branches/avl_string_cache/src/packfile/pf_items.c

Modified: branches/avl_string_cache/src/packfile/pf_items.c
==============================================================================
--- branches/avl_string_cache/src/packfile/pf_items.c	Thu Apr 22 09:55:26 2010	(r45889)
+++ branches/avl_string_cache/src/packfile/pf_items.c	Thu Apr 22 10:01:11 2010	(r45890)
@@ -1307,9 +1307,10 @@
 {
     ASSERT_ARGS(PF_fetch_string)
     STRING   *s;
-    UINTVAL   flags      = PF_fetch_opcode(pf, cursor);
-    opcode_t  charset_nr = PF_fetch_opcode(pf, cursor);
-    size_t    size       = (size_t)PF_fetch_opcode(pf, cursor);
+    opcode_t  flag_charset_word;
+    UINTVAL   flags;
+    UINTVAL   charset_nr;
+    size_t    size;
     const int wordsize   = pf ? pf->header->wordsize : sizeof (opcode_t);
     const CHARSET *charset;