From 7ade3123f19ffa2f65d7fc1af59bcbeb64a9e964 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 20 May 2004 08:02:11 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@6376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a95fb7e32..0561c8bdb 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" -- cgit