From 066a8e6205a56e44f04608914fe0f2a6d2000932 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jul 2007 14:14:08 +0000
Subject: 	* include/ruby/onigiruma.h (ONIG_EXTERN): use RUBY_EXTERN if
 defined.

	* regenc.h: include ruby/defines.h.

	* regint.h: x64-mswin64 support.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/oniguruma.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/ruby')

diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index a615426e3..1c10939df 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
-- 
cgit