summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xwin32/mkexports.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b62d5a943..7dd8f7d594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 5 13:08:24 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/mkexports.rb (each_export): VC10 support.
+ a patch from Charlie Savage in [ruby-core:29254]
+
Sun Apr 4 22:18:32 2010 Tanaka Akira <akr@fsij.org>
* time.c (cmp): optimize for fixnums.
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 2fac64bea3..e96f9339d0 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -110,7 +110,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:]]{16}$/ =~ l || /^_DllMain@/ =~ l
+ next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || /^_DllMain@/ =~ l
l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
next