about summary refs log tree commit diff
path: root/iconv/loop.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-03-26 15:37:35 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2014-04-09 15:05:36 -0500
commit27822ce67fbf7f2b204992a410e7da2e8c1e2607 (patch)
tree6acda311114ef0da18e825c4d26e0013c321a679 /iconv/loop.c
parenta88ddc902b804a6156f6e5e5feb979754a3e789a (diff)
downloadglibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.tar.gz
glibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.tar.xz
glibc-27822ce67fbf7f2b204992a410e7da2e8c1e2607.zip
Define _STRING_ARCH_unaligned unconditionally
This patch defines _STRING_ARCH_unaligned to 0 on default bits/string.h
header to avoid undefined compiler warnings on platforms that do not
define it.  It also make adjustments in code where tests checked if macro
existed or not.
Diffstat (limited to 'iconv/loop.c')
-rw-r--r--iconv/loop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/loop.c b/iconv/loop.c
index f836d08c37..f86f62747a 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -63,7 +63,7 @@
    representations with a fixed width of 2 or 4 bytes.  But if we cannot
    access unaligned memory we still have to read byte-wise.  */
 #undef FCTNAME2
-#if defined _STRING_ARCH_unaligned || !defined DEFINE_UNALIGNED
+#if _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))
@@ -342,7 +342,7 @@ FCTNAME (LOOPFCT) (struct __gconv_step *step,
 
 /* Include the file a second time to define the function to handle
    unaligned access.  */
-#if !defined DEFINE_UNALIGNED && !defined _STRING_ARCH_unaligned \
+#if !defined DEFINE_UNALIGNED && !_STRING_ARCH_unaligned \
     && MIN_NEEDED_INPUT != 1 && MAX_NEEDED_INPUT % MIN_NEEDED_INPUT == 0 \
     && MIN_NEEDED_OUTPUT != 1 && MAX_NEEDED_OUTPUT % MIN_NEEDED_OUTPUT == 0
 # undef get16