diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 08:39:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 08:39:14 +0000 |
| commit | a9467905d1f0113d66fe40cf49cc4ce24e3df255 (patch) | |
| tree | 4d368833ae69e551d1dfe8de22ed9d5edfd2eb15 /tool | |
| parent | 2599b8b8f570e41ca71cef7c3387210afa06f501 (diff) | |
| download | ruby-a9467905d1f0113d66fe40cf49cc4ce24e3df255.tar.gz | |
use mingw ANSI stdio
[Bug #13496]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/m4/ruby_check_printf_prefix.m4 | 4 | ||||
| -rw-r--r-- | tool/m4/ruby_mingw32.m4 | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tool/m4/ruby_check_printf_prefix.m4 b/tool/m4/ruby_check_printf_prefix.m4 index eab5dbeac6..9007c18c0a 100644 --- a/tool/m4/ruby_check_printf_prefix.m4 +++ b/tool/m4/ruby_check_printf_prefix.m4 @@ -8,9 +8,9 @@ AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[ [@%:@include <stdio.h> @%:@include <stddef.h> @%:@ifdef __GNUC__ - @%:@ifdef __MINGW32__ + @%:@if defined __MINGW_PRINTF_FORMAT @%:@define PRINTF_ARGS(decl, string_index, first_to_check) \ - decl __attribute__((format(gnu_printf, string_index, first_to_check))) + decl __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, first_to_check))) @%:@else @%:@define PRINTF_ARGS(decl, string_index, first_to_check) \ decl __attribute__((format(printf, string_index, first_to_check))) diff --git a/tool/m4/ruby_mingw32.m4 b/tool/m4/ruby_mingw32.m4 index 57b83f26ee..f44fe5575c 100644 --- a/tool/m4/ruby_mingw32.m4 +++ b/tool/m4/ruby_mingw32.m4 @@ -12,6 +12,7 @@ rm -f conftest*]) AS_IF([test "$rb_cv_mingw32" = yes], [ target_os="mingw32" : ${ac_tool_prefix:="`expr "$CC" : ['\(.*-\)g\?cc[^/]*$']`"} + AC_DEFINE(__USE_MINGW_ANSI_STDIO, 1) dnl for gnu_printf ]) ]) AS_CASE(["$target_os"], [mingw*msvc], [ |