From a784e502472fb3a1afa4d01a47c66b52d23e00f6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 Jan 2012 23:57:22 -0500 Subject: Remove pre-ISO C support No more __const. --- iconv/loop.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'iconv/loop.c') diff --git a/iconv/loop.c b/iconv/loop.c index 2e88b1d..e129261 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -66,8 +66,8 @@ #undef FCTNAME2 #if defined _STRING_ARCH_unaligned || !defined DEFINE_UNALIGNED /* We can handle unaligned memory access. */ -# define get16(addr) *((__const uint16_t *) (addr)) -# define get32(addr) *((__const uint32_t *) (addr)) +# define get16(addr) *((const uint16_t *) (addr)) +# define get32(addr) *((const uint32_t *) (addr)) /* We need no special support for writing values either. */ # define put16(addr, val) *((uint16_t *) (addr)) = (val) @@ -78,13 +78,13 @@ /* Distinguish between big endian and little endian. */ # if __BYTE_ORDER == __LITTLE_ENDIAN # define get16(addr) \ - (((__const unsigned char *) (addr))[1] << 8 \ - | ((__const unsigned char *) (addr))[0]) + (((const unsigned char *) (addr))[1] << 8 \ + | ((const unsigned char *) (addr))[0]) # define get32(addr) \ - (((((__const unsigned char *) (addr))[3] << 8 \ - | ((__const unsigned char *) (addr))[2]) << 8 \ - | ((__const unsigned char *) (addr))[1]) << 8 \ - | ((__const unsigned char *) (addr))[0]) + (((((const unsigned char *) (addr))[3] << 8 \ + | ((const unsigned char *) (addr))[2]) << 8 \ + | ((const unsigned char *) (addr))[1]) << 8 \ + | ((const unsigned char *) (addr))[0]) # define put16(addr, val) \ ({ uint16_t __val = (val); \ @@ -103,13 +103,13 @@ (void) 0; }) # else # define get16(addr) \ - (((__const unsigned char *) (addr))[0] << 8 \ - | ((__const unsigned char *) (addr))[1]) + (((const unsigned char *) (addr))[0] << 8 \ + | ((const unsigned char *) (addr))[1]) # define get32(addr) \ - (((((__const unsigned char *) (addr))[0] << 8 \ - | ((__const unsigned char *) (addr))[1]) << 8 \ - | ((__const unsigned char *) (addr))[2]) << 8 \ - | ((__const unsigned char *) (addr))[3]) + (((((const unsigned char *) (addr))[0] << 8 \ + | ((const unsigned char *) (addr))[1]) << 8 \ + | ((const unsigned char *) (addr))[2]) << 8 \ + | ((const unsigned char *) (addr))[3]) # define put16(addr, val) \ ({ uint16_t __val = (val); \ -- cgit v1.1