merge revision(s) 18664:

shyouhei · shyouhei · commit 9bde13e78d67 · 2009-01-19T09:24:53.000Z
* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
	  rb_broken_glibc_ia64_erfc.
	  [ruby-core:18228]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 19 18:24:13 2009  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
+	  rb_broken_glibc_ia64_erfc.
+	  [ruby-core:18228]
+
 Sat Jan 17 12:13:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* random.c (Init_Random): always initialize seed.
diff --git a/configure.in b/configure.in
@@ -535,7 +535,7 @@ AC_CHECK_FUNCS(ftello)
 # http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
 # Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
 # Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
-AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_broken_glibc_ia64_erfc,
+AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_cv_broken_glibc_ia64_erfc,
   [AC_TRY_RUN([
 #include <math.h>
 int
@@ -545,10 +545,10 @@ main()
    return 0;
 }
 ],
-	rb_broken_glibc_ia64_erfc=no,
-	rb_broken_glibc_ia64_erfc=yes,
-	rb_broken_glibc_ia64_erfc=no)])
-case $rb_broken_glibc_ia64_erfc in
+	rb_cv_broken_glibc_ia64_erfc=no,
+	rb_cv_broken_glibc_ia64_erfc=yes,
+	rb_cv_broken_glibc_ia64_erfc=no)])
+case $rb_cv_broken_glibc_ia64_erfc in
   yes) ac_cv_func_erf=no;;
 esac
 
diff --git a/version.h b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-17"
+#define RUBY_RELEASE_DATE "2009-01-19"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090117
-#define RUBY_PATCHLEVEL 302
+#define RUBY_RELEASE_CODE 20090119
+#define RUBY_PATCHLEVEL 303
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
