summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-04 08:39:14 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-04 08:39:14 (GMT)
commit1cf2bb4b2085758112503e7da7414d1ef52d4f48 (patch)
tree4d368833ae69e551d1dfe8de22ed9d5edfd2eb15 /tool
parentfb7a5690771fbf9f103887a86b9d82051cb25876 (diff)
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.m44
-rw-r--r--tool/m4/ruby_mingw32.m41
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 eab5dbe..9007c18 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 57b83f2..f44fe55 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], [