3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 96c3f7e4a8..fa02c3007e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  4 10:07:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.c (UNALIGNED): get rid of conflict.
+
 Mon May  3 08:15:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/syck/emitter.c (syck_scan_scalar): set SCAN_WHITEEDGE flag
diff --git a/version.c b/version.c
index 72a368952d..35bf153e7d 100644
--- a/version.c
+++ b/version.c
@@ -20,11 +20,13 @@
 #define rb_str_new_cstr(str) rb_str_new(str, strlen(str))
 #endif
 #define MKSTR(type) rb_obj_freeze(rb_str_new(TOKEN_PASTE(ruby_,type), sizeof(TOKEN_PASTE(ruby_,type))-1))
+#ifndef UNALIGNED
 #ifdef __GNUC__
 #define UNALIGNED __attribute__((aligned(1)))
 #else
 #define UNALIGNED
 #endif
+#endif
 
 const int ruby_patchlevel = RUBY_PATCHLEVEL;
 const char ruby_version[] = RUBY_VERSION;
diff --git a/version.h b/version.h
index 0814553246..73a696a212 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-05-03"
+#define RUBY_RELEASE_DATE "2010-05-04"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100503
+#define RUBY_RELEASE_CODE 20100504
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN