From 27822ce67fbf7f2b204992a410e7da2e8c1e2607 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 26 Mar 2014 15:37:35 -0500 Subject: 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. --- iconv/skeleton.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'iconv/skeleton.c') diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 14318a6..c3f161a 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -204,7 +204,7 @@ /* Define macros which can access unaligned buffers. These macros are supposed to be used only in code outside the inner loops. For the inner loops we have other definitions which allow optimized access. */ -#ifdef _STRING_ARCH_unaligned +#if _STRING_ARCH_unaligned /* We can handle unaligned memory access. */ # define get16u(addr) *((const uint16_t *) (addr)) # define get32u(addr) *((const uint32_t *) (addr)) @@ -523,7 +523,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, INTERNAL, for which the subexpression evaluates to 1, but INTERNAL buffers are always aligned correctly. */ #define POSSIBLY_UNALIGNED \ - (!defined _STRING_ARCH_unaligned \ + (!_STRING_ARCH_unaligned \ && (((FROM_LOOP_MIN_NEEDED_FROM != 1 \ && FROM_LOOP_MAX_NEEDED_FROM % FROM_LOOP_MIN_NEEDED_FROM == 0) \ && (FROM_LOOP_MIN_NEEDED_TO != 1 \ -- cgit v1.1