Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Properly fix merge conflict.

git-svn-id: https://svn.parrot.org/parrot/branches/avl_string_cache@45890 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
commit 94427186483deb45e2a350a7e15139c21bfa6819 1 parent b025176
@bacek bacek authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/packfile/pf_items.c
View
7 src/packfile/pf_items.c
@@ -1307,9 +1307,10 @@ PF_fetch_string(PARROT_INTERP, ARGIN_NULLOK(PackFile *pf), ARGIN(const opcode_t
{
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;
Please sign in to comment.
Something went wrong with that request. Please try again.