merge from trunk (r28772)

* include/ruby/missing.h: shouldn't declare as dllimport when building
  ruby itself (for Windows).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2bbef4ef90..6ce7975528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 28 19:41:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/missing.h: shouldn't declare as dllimport when building
+	  ruby itself (for Windows).
+
 Wed Jul 28 17:11:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing/*.c: include missing.h
diff --git a/missing.h b/missing.h
index 6879635040..2b3bb16e5d 100644
--- a/missing.h
+++ b/missing.h
@@ -65,6 +65,9 @@ struct timezone {
 };
 #endif
 
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+#endif
 #ifndef RUBY_EXTERN
 #define RUBY_EXTERN extern
 #endif