1.1 --- a/templates/native/iconv.c Mon Feb 27 11:57:15 2017 +0100
1.2 +++ b/templates/native/iconv.c Mon Feb 27 14:41:27 2017 +0100
1.3 @@ -57,13 +57,13 @@
1.4 /* cd interpreted as iconv_t */
1.5 iconv_t c = (iconv_t) cd->datavalue;
1.6 /* state.__data__ interpreted as list */
1.7 - __fragment *f = __load_via_object(state->value, __ATTRPOS(__data__)).seqvalue;
1.8 + __fragment *f = __load_via_object(state->value, __data__).seqvalue;
1.9
1.10 /* Obtain the string, start position, and remaining bytes from the state. */
1.11
1.12 - char *inbuf = __load_via_object(f->attrs[0].value, __ATTRPOS(__data__)).strvalue;
1.13 - int start = __load_via_object(f->attrs[1].value, __ATTRPOS(__data__)).intvalue;
1.14 - int remaining = __load_via_object(f->attrs[2].value, __ATTRPOS(__data__)).intvalue;
1.15 + char *inbuf = __load_via_object(f->attrs[0].value, __data__).strvalue;
1.16 + int start = __load_via_object(f->attrs[1].value, __data__).intvalue;
1.17 + int remaining = __load_via_object(f->attrs[2].value, __data__).intvalue;
1.18
1.19 /* Allocate a string for the output buffer using the remaining input size
1.20 as a guide. */
1.21 @@ -142,9 +142,9 @@
1.22 __attr * const tocode = &__args[1];
1.23 __attr * const fromcode = &__args[2];
1.24 /* tocode.__data__ interpreted as string */
1.25 - char *t = __load_via_object(tocode->value, __ATTRPOS(__data__)).strvalue;
1.26 + char *t = __load_via_object(tocode->value, __data__).strvalue;
1.27 /* fromcode.__data__ interpreted as string */
1.28 - char *f = __load_via_object(fromcode->value, __ATTRPOS(__data__)).strvalue;
1.29 + char *f = __load_via_object(fromcode->value, __data__).strvalue;
1.30 iconv_t result;
1.31 __attr attr;
1.32