summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-19 13:34:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-19 13:34:30 +0000
commit66ffd658fd1173de7ce24798b473d75407f83d2a (patch)
tree5965fe8e0235f3d7f2f0123abdbf02303ea2442d
parent3b8eb3d7543a57cfc7b849a0fdb189c19b0537fd (diff)
merges r23072 from trunk into ruby_1_9_1.
-- * ext/sdbm/_sdbm.c: should include "ruby/defines.h" as well for prototypes of compatibility functions on Win32 platform. [ruby-core:22870] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/sdbm/_sdbm.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a12319fa91..0ee7f87ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 13 21:11:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/sdbm/_sdbm.c: should include "ruby/defines.h" as well for
+ prototypes of compatibility functions on Win32 platform.
+ [ruby-core:22870]
+
Thu Mar 26 11:33:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 5668c2c184..b3a598dbc6 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -13,6 +13,7 @@
#include "sdbm.h"
#include "ruby/config.h"
+#include "ruby/defines.h"
/*
* sdbm - ndbm work-alike hashed database library