From b9bfa39d146db783083940e943e2224dfd81518b Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:51:10 +0000 Subject: merges r20909 and r20910 from trunk into ruby_1_9_1. * configure.in (mingw): no longer uses snprintf and vsnprintf of msvcrt. * win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): removed. * win32/Makefile.sub (config.h): vsnprintf exists in VC7 or later. * win32/mkexports.rb (Exports#initialize): aliases rb_w32_vsnprintf and rb_w32_snprintf for binary compatibility. * sprintf.c (rb_str_format): uses snprintf instead of sprintf. * numeric.c (flo_to_s, rb_num2long, rb_num2ll): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 2 ++ 1 file changed, 2 insertions(+) (limited to 'win32/Makefile.sub') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 862230785..eece6f914 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -423,7 +423,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_STRTOUL 1 #define HAVE_FLOCK 1 #define HAVE_SNPRINTF 1 +!if $(MSC_VER) >= 1300 #define HAVE_VSNPRINTF 1 +!endif #define HAVE_ISNAN 1 #define HAVE_FINITE 1 #define HAVE_HYPOT 1 -- cgit