summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--include/ruby/missing.h6
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e58ba7606a..b50c926e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jul 28 19:37:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): VC6 or later have stddef.h.
+
+ * include/ruby/missing.h: need to include stddef.h for size_t.
+
+ * 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/include/ruby/missing.h b/include/ruby/missing.h
index bed633d379..abbd2bf870 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -19,6 +19,9 @@ extern "C" {
#endif
#include "ruby/config.h"
+#if defined(HAVE_STDDEF_H)
+# include <stddef.h>
+#endif
#ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H
#endif
@@ -50,6 +53,9 @@ struct timezone {
};
#endif
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+#endif
#ifndef RUBY_EXTERN
#define RUBY_EXTERN extern
#endif