summaryrefslogtreecommitdiff
path: root/win32/mkexports.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-10 03:06:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-10 03:06:15 +0000
commit2b592580bf65040373b55ff2ccc3b59a0a231a18 (patch)
tree642a6c82599486537c3136f32cac7a644c4bf4a3 /win32/mkexports.rb
parent1b8a677b235066d91994e3490e0bce5a098196a2 (diff)
* include/ruby: moved public headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/mkexports.rb')
-rwxr-xr-xwin32/mkexports.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 2fe867e..7ef12cd 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -40,7 +40,7 @@ class Exports
syms[internal] = export
winapis[$1] = internal if /^_?(rb_w32_\w+)(?:@\d+)?$/ =~ internal
end
- win32h = File.join(File.dirname(__FILE__), "win32.h")
+ win32h = File.join(File.dirname(File.dirname(__FILE__)), "include/ruby/win32.h")
IO.foreach(win32h) do |line|
if /^#define (\w+)\((.*?)\)\s+(?:\(void\))?(rb_w32_\w+)\((.*?)\)\s*$/ =~ line and
$2.delete(" ") == $4.delete(" ")
@@ -80,7 +80,7 @@ end
class Exports::Mswin < Exports
def each_export(objs)
- noprefix = ($arch and /^sh/ !~ $arch)
+ noprefix = ($arch ||= nil and /^sh/ !~ $arch)
objs = objs.collect {|s| s.tr('/', '\\')}
filetype = nil
IO.popen(%w"dumpbin -symbols -exports" + objs) do |f|