merges r21115 from trunk into ruby_1_9_1.

* sprintf.c: not force to override snprintf/vsnprintf.
  [ruby-core:20824]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ca20bc8a76..98e9d24fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 28 18:39:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c: not force to override snprintf/vsnprintf.
+	  [ruby-core:20824]
+
 Sun Dec 28 21:33:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* test/ext/dl/test_base.rb : add BSD's case.
diff --git a/sprintf.c b/sprintf.c
index cc8f097e5b..83560def99 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -1081,12 +1081,9 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
 #  define u_quad_t unsigned LONG_LONG
 # endif
 #endif
-#undef vsnprintf
 #undef snprintf
 #define FLOATING_POINT 1
 #define BSD__dtoa ruby_dtoa
-#undef HAVE_VSNPRINTF
-#undef HAVE_SNPRINTF
 #if _MSC_VER >= 1300
 #pragma warning(disable: 4273)
 #endif