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 --- include/ruby/missing.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/ruby/missing.h') diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 16d5a6f02..ea40f62a5 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -144,9 +144,13 @@ RUBY_EXTERN long strtol(const char *, char **, int); #endif */ -#ifndef HAVE_VSNPRINTF +#if defined HAVE_VSNPRINTF || defined HAVE_SNPRINTF # include +#endif +#ifndef HAVE_SNPRINTF RUBY_EXTERN int snprintf(char *, size_t n, char const *, ...); +#endif +#ifndef HAVE_VSNPRINTF RUBY_EXTERN int vsnprintf(char *, size_t n, char const *, va_list); #endif -- cgit