summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-20 08:02:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-20 08:02:11 +0000
commitfc04396ea31c74a85bb34ea4d2bbebd13e8f87f9 (patch)
tree18f2d73e7a8ecb701ce1a3255d7d34b7dc81cc1b /lib
parent2ef79516bc53dee1a6c21beae717e9f530ecc202 (diff)
* lib/mkmf.rb (check_sizeof): define result size. [ruby-core:02911]
* lib/mkmf.rb (create_header): macro name should not include equal sign. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a95fb7e326..0561c8bdb6 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -599,7 +599,7 @@ def check_sizeof(type, header = nil, &b)
message "%s", m
Logging::message "check_sizeof: %s--------------------\n", m
if size = try_constant(expr, header, &b)
- $defs.push(format("-DSIZEOF_%s", type.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DSIZEOF_%s=%d", type.upcase.tr_s("^A-Z0-9_", "_"), size))
end
message(a = size ? "#{size}\n" : "failed\n")
Logging::message "-------------------- %s\n", a
@@ -652,7 +652,7 @@ def create_header(header = "extconf.h")
hfile.print "#ifndef #{sym}\n#define #{sym}\n"
for line in $defs
case line
- when /^-D(.*)(?:=(.*))?/
+ when /^-D([^=]+)(?:=(.*))?/
hfile.print "#define #$1 #{$2 || 1}\n"
when /^-U(.*)/
hfile.print "#undef #$1\n"