summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--lib/mkmf.rb4
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e6590e2f9f..8d1a2446b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 20 17:02:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (check_sizeof): define result size. [ruby-core:02911]
+
+ * lib/mkmf.rb (create_header): macro name should not include equal
+ sign.
+
Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c: check SCM_RIGHTS macro addition to
@@ -11,7 +18,7 @@ Thu May 20 12:38:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
Thu May 20 12:34:39 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
At Ryan Davis' suggestion, honor visibility modifers if guarded by a
statement modifier
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"