diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-22 02:28:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-22 02:28:10 +0000 |
| commit | 85ddcb935791939d107cf11db7b3839f82b95cb0 (patch) | |
| tree | cee3fc46b268f02e2b737427986ffae8b0e241d3 /win32/mkexports.rb | |
| parent | 9852802c887b1457dbff4f83e341b768fbfe6a5d (diff) | |
merge revision(s) 54737,54740,55792: [Backport #14623]
Support MSVC14 and 15 [Bug #11118]
Search _pioinfo which is not exported after MSVC14.
[Bug #12014] [GH-884]
win32.c: suppress warnings
* win32/win32.c (set_pioinfo_extra): remove "/*" within comment.
* win32/win32.c (set_pioinfo_extra): use more reliable way to search
the position of pioinfo of VC14, and also support debug library of it.
patched by davispuh AT gmail.com
[ruby-core:76644] [Bug #12644]
this fixes also [Bug #12631]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/mkexports.rb')
| -rwxr-xr-x | win32/mkexports.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/win32/mkexports.rb b/win32/mkexports.rb index c3514f13ab..d26acbb107 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -114,6 +114,7 @@ class Exports::Mswin < Exports when /OBJECT/, /LIBRARY/ next if /^[[:xdigit:]]+ 0+ UNDEF / =~ l next unless /External/ =~ l + next if /(?:_local_stdio_printf_options|v(f|sn?)printf_l)\Z/ =~ l next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l |