aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-20 14:34:39 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-20 14:34:39 +0000
commitd41d2f26ceeca3078aa8faff704e571247eb87e8 (patch)
tree3f194f7645a048816ab04614e8079b46caca593e
parentcffda96b47bfd0451eb7bb04a0a58d8983fc8aca (diff)
downloadruby-d41d2f26ceeca3078aa8faff704e571247eb87e8.tar.gz
* configure.in: Add '#include <stdlib.h>' to
rb_cv_localtime_overflow test too. It's reported by Tomoyuki Chikanaga. Thanks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in1
-rw-r--r--test/psych/test_json_tree.rb4
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ccff23892..8959260926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 20 23:25:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * configure.in: Add '#include <stdlib.h>' to
+ rb_cv_localtime_overflow test too. It's reported by Tomoyuki
+ Chikanaga. Thanks.
+
Thu Jan 20 16:11:00 2011 Kenta Murata <mrkn@mrkn.jp>
* README.EXT, README.EXT.ja: You shouldn't choose ``conftest.c'' as a
diff --git a/configure.in b/configure.in
index 3a60ddf9a8..c25296639c 100644
--- a/configure.in
+++ b/configure.in
@@ -1485,6 +1485,7 @@ fi
# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
[AC_TRY_RUN([
+#include <stdlib.h>
#include <time.h>
void
diff --git a/test/psych/test_json_tree.rb b/test/psych/test_json_tree.rb
index 5fcb0d6a37..98c4678982 100644
--- a/test/psych/test_json_tree.rb
+++ b/test/psych/test_json_tree.rb
@@ -41,8 +41,8 @@ module Psych
end
def test_time
- time = Time.new(2010, 10, 10).utc
- assert_equal "{\"a\": \"2010-10-10 07:00:00.000000000Z\"}\n", Psych.to_json({'a' => time })
+ time = Time.utc(2010, 10, 10).utc
+ assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n", Psych.to_json({'a' => time })
end
def test_datetime