diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-03-26 15:37:35 -0500 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-04-09 15:05:36 -0500 |
| commit | 27822ce67fbf7f2b204992a410e7da2e8c1e2607 (patch) | |
| tree | 6acda311114ef0da18e825c4d26e0013c321a679 /iconv | |
| parent | a88ddc902b804a6156f6e5e5feb979754a3e789a (diff) | |
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')
| -rw-r--r-- | iconv/gconv_simple.c | 8 | ||||
| -rw-r--r-- | iconv/loop.c | 4 | ||||
| -rw-r--r-- | iconv/skeleton.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index e11e2eea2d..f357713d93 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -112,7 +112,7 @@ internal_ucs4_loop (struct __gconv_step *step, return result; } -#ifndef _STRING_ARCH_unaligned +#if !_STRING_ARCH_unaligned static inline int __attribute ((always_inline)) internal_ucs4_loop_unaligned (struct __gconv_step *step, @@ -289,7 +289,7 @@ ucs4_internal_loop (struct __gconv_step *step, return result; } -#ifndef _STRING_ARCH_unaligned +#if !_STRING_ARCH_unaligned static inline int __attribute ((always_inline)) ucs4_internal_loop_unaligned (struct __gconv_step *step, @@ -478,7 +478,7 @@ internal_ucs4le_loop (struct __gconv_step *step, return result; } -#ifndef _STRING_ARCH_unaligned +#if !_STRING_ARCH_unaligned static inline int __attribute ((always_inline)) internal_ucs4le_loop_unaligned (struct __gconv_step *step, @@ -658,7 +658,7 @@ ucs4le_internal_loop (struct __gconv_step *step, return result; } -#ifndef _STRING_ARCH_unaligned +#if !_STRING_ARCH_unaligned static inline int __attribute ((always_inline)) ucs4le_internal_loop_unaligned (struct __gconv_step *step, 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 diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 14318a6a53..c3f161ad01 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 \ |