diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_trans.c | 4 | ||||
| -rw-r--r-- | iconv/skeleton.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c index 919d438abe..3d02b461d6 100644 --- a/iconv/gconv_trans.c +++ b/iconv/gconv_trans.c @@ -366,8 +366,8 @@ __gconv_translit_find (struct trans_struct *trans) memset (newp, '\0', sizeof (struct known_trans)); /* Store a copy of the module name. */ - newp->info.name = (char *) (newp + 1); - cp = __mempcpy ((char *) newp->info.name, trans->name, name_len); + newp->info.name = cp = (char *) (newp + 1); + cp = __mempcpy (cp, trans->name, name_len); newp->fname = cp; diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 06e373013d..2b080bacb6 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -127,8 +127,8 @@ static int to_object; loops we have other definitions which allow optimized access. */ #ifdef _STRING_ARCH_unaligned /* We can handle unaligned memory access. */ -# define get16u(addr) *((uint16_t *) (addr)) -# define get32u(addr) *((uint32_t *) (addr)) +# define get16u(addr) *((__const uint16_t *) (addr)) +# define get32u(addr) *((__const uint32_t *) (addr)) /* We need no special support for writing values either. */ # define put16u(addr, val) *((uint16_t *) (addr)) = (val) |