aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--iconv/loop.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5453619f38..1fde5ec463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* iconv/skeleton.c: Define access macros with u suffix. Adjust
#if expression for use of unaligned function to the one used in
the definition of these functions.
+ * iconv/loop.c: Undefined `unaligned' before recursive inclusion.
* iconv/gconv_simple.c (internal_ucs4_loop_unaligned): New function.
(internal_ucs4le_loop_unaligned): New function.
diff --git a/iconv/loop.c b/iconv/loop.c
index bf0ab487f4..1e5403310e 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -265,6 +265,7 @@ FCTNAME (LOOPFCT) (const unsigned char **inptrp, const unsigned char *inend,
#undef get32
#undef put16
#undef put32
+#undef unaligned
/* Include the file a second time to define the function to define the
function to handle unaligned access. */