diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Dec 11 19:18:12 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/mkexports.rb (each_export): skip garbages generated by VS2012's + nmake. + reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484] + Tue Dec 11 19:15:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_here_document): flush string content between new @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 338 +#define RUBY_PATCHLEVEL 339 #define RUBY_RELEASE_DATE "2012-12-11" #define RUBY_RELEASE_YEAR 2012 diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 22c0019294..cc3dcf2751 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -111,7 +111,7 @@ class Exports::Mswin < Exports next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,32}$/ =~ l || /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') |