2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c28793a018..9e4b6314bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 25 00:57:59 2010  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swap64): don't redefine.
+
 Thu Feb 25 00:29:55 2010  Tanaka Akira  <akr@fsij.org>
 
 	* pack.c (pack_unpack): don't use OFF32 for gcc 4.5.
diff --git a/pack.c b/pack.c
index 958a2401ac..90dd47aa43 100644
--- a/pack.c
+++ b/pack.c
@@ -100,8 +100,7 @@ TOKEN_PASTE(swap,x)(xtype z)		\
 			|(((x)&0x0000FF0000000000L)>>24)	\
 			|(((x)&0x00000000FF000000L)<<8)	\
 			|(((x)&0x000000FF00000000L)>>8))
-#endif
-#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
+#elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
 #define swap64(x)       ((((x)&0x00000000000000FFLL)<<56)	\
 			|(((x)&0xFF00000000000000LL)>>56)	\
 			|(((x)&0x000000000000FF00LL)<<40)	\