naruse	2012-02-12 09:30:50 +0900 (Sun, 12 Feb 2012)

  New Revision: 34565

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34565

  Log:
    merge revision(s) 32544: [Backport #6005]
    
    * regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not
      allow unaligned word access.
    
    * st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word
      access as well as i386.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/regint.h
    branches/ruby_1_9_3/st.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34564)
+++ ruby_1_9_3/ChangeLog	(revision 34565)
@@ -1,3 +1,11 @@
+Sun Feb 12 09:29:28 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not
+	  allow unaligned word access.
+
+	* st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word
+	  access as well as i386.
+
 Sat Feb 11 08:06:12 2012  Tanaka Akira  <akr@f...>
 
 	* test/openssl/test_ssl.rb (test_multibyte_read_write): start server
Index: ruby_1_9_3/st.c
===================================================================
--- ruby_1_9_3/st.c	(revision 34564)
+++ ruby_1_9_3/st.c	(revision 34565)
@@ -1002,7 +1002,9 @@
 #else
 
 #ifndef UNALIGNED_WORD_ACCESS
-# if defined __i386__ || defined _M_IX86
+# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
+     defined(__mc68020__)
 #   define UNALIGNED_WORD_ACCESS 1
 # endif
 #endif
Index: ruby_1_9_3/regint.h
===================================================================
--- ruby_1_9_3/regint.h	(revision 34564)
+++ ruby_1_9_3/regint.h	(revision 34565)
@@ -48,7 +48,6 @@
 #endif
 
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-    (defined(__ppc__) && defined(__APPLE__)) || \
     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
     defined(__mc68020__)
 #define PLATFORM_UNALIGNED_WORD_ACCESS
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34564)
+++ ruby_1_9_3/version.h	(revision 34565)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 95
+#define RUBY_PATCHLEVEL 96
 
-#define RUBY_RELEASE_DATE "2012-02-11"
+#define RUBY_RELEASE_DATE "2012-02-12"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/