(put16): Remove __const. Fix access index. (put32): Remove __const. Use uint32_t...

diff --git a/iconv/loop.c b/iconv/loop.c
index 9af06bccdcd7267fdceb4c85308cfcf98293fc87..7ddeb3da4955168106cad046a61c2c729ef6f3a1 100644 (file)
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -82,20 +82,20 @@
        | ((__const unsigned char *) (addr))[1]) << 8                         \
       | ((__const unsigned char *) (addr))[0])
 
-# define put16(addr, val) \
+#  define put16(addr, val) \
      ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
-       ((__const unsigned char *) (addr))[1] = __val >> 8;                   \
+       ((unsigned char *) (addr))[0] = __val;                                \
+       ((unsigned char *) (addr))[1] = __val >> 8;                           \
        (void) 0; })
-# define put32(addr, val) \
-     ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
+#  define put32(addr, val) \
+     ({ uint32_t __val = (val);                                                      \
+       ((unsigned char *) (addr))[0] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
+       ((unsigned char *) (addr))[1] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[2] = __val;                        \
+       ((unsigned char *) (addr))[2] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[3] = __val;                        \
+       ((unsigned char *) (addr))[3] = __val;                                \
        (void) 0; })
 # else
 #  define get16(addr) \
@@ -107,20 +107,20 @@
        | ((__const unsigned char *) (addr))[2]) << 8                         \
       | ((__const unsigned char *) (addr))[3])
 
-# define put16(addr, val) \
+#  define put16(addr, val) \
      ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
-       ((__const unsigned char *) (addr))[2] = __val >> 8;                   \
+       ((unsigned char *) (addr))[1] = __val;                                \
+       ((unsigned char *) (addr))[2] = __val >> 8;                           \
        (void) 0; })
-# define put32(addr, val) \
-     ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[3] = __val;                        \
+#  define put32(addr, val) \
+     ({ uint32_t __val = (val);                                                      \
+       ((unsigned char *) (addr))[3] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[2] = __val;                        \
+       ((unsigned char *) (addr))[2] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
+       ((unsigned char *) (addr))[1] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
+       ((unsigned char *) (addr))[0] = __val;                                \
        (void) 0; })
 # endif
 
@@ -261,6 +261,11 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 }
 
 
+#undef get16
+#undef get32
+#undef put16
+#undef put32
+
 /* Include the file a second time to define the function to define the
    function to handle unaligned access.  */
 #if !defined _STRING_ARCH_unaligned && !defined DEFINE_UNALIGNED
@@ -282,8 +287,3 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
 #undef EXTRA_LOOP_DECLS
 #undef INIT_PARAMS
 #undef UPDATE_PARAMS
-
-#undef get16
-#undef get32
-#undef put16
-#undef put32

diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index ad381ec77c02ea549bfe154e3a81442a86c2e6f2..dfd067e05ae887947074098da2d70f3e683c0618 100644 (file)
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -140,20 +140,20 @@ static int to_object;
        | ((__const unsigned char *) (addr))[1]) << 8                         \
       | ((__const unsigned char *) (addr))[0])
 
-# define put16(addr, val) \
+#  define put16(addr, val) \
      ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
-       ((__const unsigned char *) (addr))[1] = __val >> 8;                   \
+       ((unsigned char *) (addr))[0] = __val;                                \
+       ((unsigned char *) (addr))[1] = __val >> 8;                           \
        (void) 0; })
-# define put32(addr, val) \
-     ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
+#  define put32(addr, val) \
+     ({ uint32_t __val = (val);                                                      \
+       ((unsigned char *) (addr))[0] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
+       ((unsigned char *) (addr))[1] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[2] = __val;                        \
+       ((unsigned char *) (addr))[2] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[3] = __val;                        \
+       ((unsigned char *) (addr))[3] = __val;                                \
        (void) 0; })
 # else
 #  define get16(addr) \
@@ -165,20 +165,20 @@ static int to_object;
        | ((__const unsigned char *) (addr))[2]) << 8                         \
       | ((__const unsigned char *) (addr))[3])
 
-# define put16(addr, val) \
+#  define put16(addr, val) \
      ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
-       ((__const unsigned char *) (addr))[2] = __val >> 8;                   \
+       ((unsigned char *) (addr))[1] = __val;                                \
+       ((unsigned char *) (addr))[2] = __val >> 8;                           \
        (void) 0; })
-# define put32(addr, val) \
-     ({ uint16_t __val = (val);                                                      \
-       ((__const unsigned char *) (addr))[3] = __val;                        \
+#  define put32(addr, val) \
+     ({ uint32_t __val = (val);                                                      \
+       ((unsigned char *) (addr))[3] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[2] = __val;                        \
+       ((unsigned char *) (addr))[2] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[1] = __val;                        \
+       ((unsigned char *) (addr))[1] = __val;                                \
        __val >>= 8;                                                          \
-       ((__const unsigned char *) (addr))[0] = __val;                        \
+       ((unsigned char *) (addr))[0] = __val;                                \
        (void) 0; })
 # endif
 #endif