about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-31 20:49:41 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-31 20:49:41 +0000
commit6674e127c93b0ed04a44c78b98ec9c76c71b49c8 (patch)
tree1adf02cc47b5942127cd10f3f2457d1722b6c17c
parentc1db8b0ddfc46134b903ff3803e9aea1cf9e55d9 (diff)
downloadglibc-6674e127c93b0ed04a44c78b98ec9c76c71b49c8.tar.gz
glibc-6674e127c93b0ed04a44c78b98ec9c76c71b49c8.tar.xz
glibc-6674e127c93b0ed04a44c78b98ec9c76c71b49c8.zip
Update.
	* iconv/loop.c: Undefined `unaligned' before recursive inclusion.
-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.  */