diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-20 08:02:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-20 08:02:11 +0000 |
| commit | 6d2d2a7e6ec87ed27344f90f713c27a2a525deea (patch) | |
| tree | bcd483d8b4232a4315d162651d102ff116206945 | |
| parent | 1416bd16d3d531eeea7d926658401208ddd0ca9c (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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 12 insertions, 5 deletions
@@ -1,11 +1,18 @@ +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 15:59:50 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/socket/socket.c: fix SEGV. [ruby-dev:23550] Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org> - * ext/socket/socket.c: check SCM_RIGHTS macro addition to - the msg_control field to test existence of file descriptor passing + * ext/socket/socket.c: check SCM_RIGHTS macro addition to + the msg_control field to test existence of file descriptor passing by msg_control. Thu May 20 12:38:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org> @@ -15,7 +22,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 ed0203b9c..0f701e0a0 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -578,7 +578,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 @@ -631,7 +631,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" |