yann@1: Fixes yann@1: yann@1: In file included from jis0208.c:23: yann@1: jis0208.h:32: error: array type has incomplete element type yann@1: when building with gcc-4.0 yann@1: yann@1: In file included from cp1258.c:869: yann@1: ../iconv/skeleton.c: In function 'gconv': yann@1: ../iconv/skeleton.c:323: error: invalid lvalue in increment yann@1: yann@1: In file included from cp1255.c:550: yann@1: ../iconv/skeleton.c: In function 'gconv': yann@1: ../iconv/skeleton.c:323: error: invalid lvalue in increment yann@1: yann@1: In file included from gb18030.c:22114: yann@1: ../iconv/loop.c: In function 'from_gb18030': yann@1: ../iconv/loop.c:282: error: invalid lvalue in increment yann@1: ../iconv/loop.c: In function 'from_gb18030_single': yann@1: ../iconv/loop.c:384: error: invalid lvalue in increment yann@1: yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/iso8859-1.c 2001-08-03 15:06:50.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/iso8859-1.c 2005-03-11 15:09:15.233602808 -0800 yann@1: @@ -35,7 +35,8 @@ yann@1: #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO yann@1: #define LOOPFCT FROM_LOOP yann@1: #define BODY \ yann@1: - *((uint32_t *) outptr)++ = *inptr++; yann@1: + *((uint32_t *) outptr) = *inptr++; \ yann@1: + outptr += sizeof (uint32_t); yann@1: #include yann@1: yann@1: yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/jis0208.h 2001-07-05 21:54:52.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/jis0208.h 2005-03-11 15:27:23.295192304 -0800 yann@1: @@ -24,15 +24,6 @@ yann@1: #include yann@1: #include yann@1: yann@1: -/* Conversion table. */ yann@1: -extern const uint16_t __jis0208_to_ucs[]; yann@1: - yann@1: -extern const char __jisx0208_from_ucs4_lat1[256][2]; yann@1: -extern const char __jisx0208_from_ucs4_greek[0xc1][2]; yann@1: -extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[]; yann@1: -extern const char __jisx0208_from_ucs_tab[][2]; yann@1: - yann@1: - yann@1: /* Struct for table with indeces in UCS mapping table. */ yann@1: struct jisx0208_ucs_idx yann@1: { yann@1: @@ -42,6 +33,15 @@ yann@1: }; yann@1: yann@1: yann@1: +/* Conversion table. */ yann@1: +extern const uint16_t __jis0208_to_ucs[]; yann@1: + yann@1: +extern const char __jisx0208_from_ucs4_lat1[256][2]; yann@1: +extern const char __jisx0208_from_ucs4_greek[0xc1][2]; yann@1: +extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[]; yann@1: +extern const char __jisx0208_from_ucs_tab[][2]; yann@1: + yann@1: + yann@1: static inline uint32_t yann@1: jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) yann@1: { yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/cp1258.c 2001-07-05 21:54:49.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/cp1258.c 2005-03-11 15:41:44.953200376 -0800 yann@1: @@ -66,7 +66,8 @@ yann@1: if (__builtin_expect (outbuf + 4 <= outend, 1)) \ yann@1: { \ yann@1: /* Write out the last character. */ \ yann@1: - *((uint32_t *) outbuf)++ = data->__statep->__count >> 3; \ yann@1: + *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ yann@1: + outbuf += sizeof (uint32_t); \ yann@1: data->__statep->__count = 0; \ yann@1: } \ yann@1: else \ yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/cp1255.c 2001-07-05 21:54:49.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/cp1255.c 2005-03-11 15:47:40.689120296 -0800 yann@1: @@ -65,7 +65,8 @@ yann@1: if (__builtin_expect (outbuf + 4 <= outend, 1)) \ yann@1: { \ yann@1: /* Write out the last character. */ \ yann@1: - *((uint32_t *) outbuf)++ = data->__statep->__count >> 3; \ yann@1: + *((uint32_t *) outbuf) = data->__statep->__count >> 3; \ yann@1: + outbuf += sizeof (uint32_t); \ yann@1: data->__statep->__count = 0; \ yann@1: } \ yann@1: else \ yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/gb18030.c 2001-08-03 15:06:47.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/gb18030.c 2005-03-11 15:54:59.060477720 -0800 yann@1: @@ -22108,7 +22108,8 @@ yann@1: } \ yann@1: } \ yann@1: \ yann@1: - *((uint32_t *) outptr)++ = ch; \ yann@1: + *((uint32_t *) outptr) = ch; \ yann@1: + outptr += sizeof (uint32_t); \ yann@1: } yann@1: #define LOOP_NEED_FLAGS yann@1: #include yann@1: --- /home/dank/downloads/glibc-2.2.5/iconvdata/iso-2022-cn-ext.c 2001-07-05 21:54:51.000000000 -0700 yann@1: +++ glibc-2.2.5/iconvdata/iso-2022-cn-ext.c 2005-03-11 15:55:42.002949472 -0800 yann@1: @@ -411,7 +411,8 @@ yann@1: } \ yann@1: } \ yann@1: \ yann@1: - *((uint32_t *) outptr)++ = ch; \ yann@1: + *((uint32_t *) outptr) = ch; \ yann@1: + outptr += sizeof (uint32_t); \ yann@1: } yann@1: #define EXTRA_LOOP_DECLS , int *setp yann@1: #define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \