From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 31 Mar 2000 20:49:41 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc_2-1-91~733
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6674e127c93b0ed04a44c78b98ec9c76c71b49c8;p=thirdparty%2Fglibc.git

Update.

	* iconv/loop.c: Undefined `unaligned' before recursive inclusion.
---

diff --git a/ChangeLog b/ChangeLog
index 5453619f387..1fde5ec463d 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 bf0ab487f4e..1e5403310e3 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.  */