From 6c4a07dfa77fc9017adba958cf6399c1f1e6af33 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 29 Mar 2010 01:40:43 +0000 Subject: [PATCH] Revert "* configure.in (ac_cv_func_snprintf, ac_cv_func_vsnprintf):" This reverts commit r27078. It causes build failure on some environments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ------ configure.in | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49cd055d6c..a0a586ebd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,12 +8,6 @@ Mon Mar 29 06:47:25 2010 Aaron Patterson * test/psych/*: ditto * lib/psych/*: ditto -Sun Mar 28 21:04:21 2010 NARUSE, Yui - - * configure.in (ac_cv_func_snprintf, ac_cv_func_vsnprintf): - use own vsnprintf to avoid locale problems and platform - difference. - Sun Mar 28 10:03:51 2010 NARUSE, Yui * lib/scanf.rb: fix max width modifier for %f. diff --git a/configure.in b/configure.in index 5047e9e054..d195f7521a 100644 --- a/configure.in +++ b/configure.in @@ -888,6 +888,8 @@ main() ac_cv_func_times=yes ac_cv_func_waitpid=yes ac_cv_func_fsync=yes + ac_cv_func_snprintf=no + ac_cv_func_vsnprintf=no ac_cv_func_seekdir=yes ac_cv_func_telldir=yes ac_cv_func_isinf=yes @@ -1114,6 +1116,7 @@ main() rb_cv_broken_glibc_ia64_erfc=no)]) AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no]) +AS_CASE(["$target_os"],[mingw*],[],[AC_REPLACE_FUNCS(vsnprintf)]) AC_REPLACE_FUNCS(dup2 memmove strerror\ strchr strstr crypt flock\ isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt signbit \ @@ -1125,7 +1128,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot getcwd eacce setrgid setegid setregid setresgid issetugid pause lchown lchmod\ getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\ getpriority getrlimit setrlimit sysconf \ - dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp\ + dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp snprintf\ setsid telldir seekdir fchmod cosh sinh tanh log2 round\ setuid setgid daemon select_large_fdset setenv unsetenv\ mktime timegm gmtime_r clock_gettime gettimeofday\