4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7adfa712be..97ca3e0104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul  3 23:12:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/onigiruma.h (ONIG_EXTERN): use RUBY_EXTERN if defined.
+
+	* regenc.h: include ruby/defines.h.
+
+	* regint.h: x64-mswin64 support.
+
 Tue Jul  3 13:47:44 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* cont.c (cont_save_machine_stack): clear saved_thread.machine_stack*.
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index a615426e39..1c10939df4 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -74,6 +74,9 @@ extern "C" {
 #endif
 
 #ifndef ONIG_EXTERN
+#ifdef RUBY_EXTERN
+#define ONIG_EXTERN   RUBY_EXTERN
+#else
 #if defined(_WIN32) && !defined(__GNUC__)
 #if defined(EXPORT) || defined(RUBY_EXPORT)
 #define ONIG_EXTERN   extern __declspec(dllexport)
@@ -82,6 +85,7 @@ extern "C" {
 #endif
 #endif
 #endif
+#endif
 
 #ifndef ONIG_EXTERN
 #define ONIG_EXTERN   extern
diff --git a/regenc.h b/regenc.h
index 882971ceb6..7aeb19a668 100644
--- a/regenc.h
+++ b/regenc.h
@@ -30,6 +30,7 @@
  */
 #ifndef REGINT_H
 #include "ruby/config.h"
+#include "ruby/defines.h"
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION
 #endif
diff --git a/regint.h b/regint.h
index 721f667557..11a84ad362 100644
--- a/regint.h
+++ b/regint.h
@@ -49,7 +49,7 @@
 
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
     (defined(__ppc__) && defined(__APPLE__)) || \
-    defined(__x86_64) || defined(__x86_64__) || \
+    defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
     defined(__mc68020__)
 #define PLATFORM_UNALIGNED_WORD_ACCESS
 #endif