summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-12 10:59:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-12 10:59:52 +0000
commitf061990c15f5b554287063239f48531594180643 (patch)
tree62a8307f428457769831580c8eaa9979ec25fb42
parent664dbfbf2aa9f2898659a03b71d4cb82b2557870 (diff)
* lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
[ruby-talk:99788] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog13
-rw-r--r--lib/mkmf.rb4
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f9af95185..7a668cf8fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 12 19:59:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
+ [ruby-talk:99788]
+
Wed May 12 17:41:42 2004 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb (Resolv::DNS::Config): make it configurable without
@@ -10,8 +15,8 @@ Wed May 12 14:37:27 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
Wed May 12 13:20:19 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib/tk/composite.rb: improve configure methods (based on
- the proposal of [ruby-talk:99671]).
+ * ext/tk/lib/tk/composite.rb: improve configure methods (based on
+ the proposal of [ruby-talk:99671]).
Wed May 12 11:51:08 2004 Dave Thomas <dave@pragprog.com>
@@ -69,7 +74,7 @@ Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
for Ranges, Strings, Structs, Regexps.
- * lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
+ * lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
String's flow style.
* lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
@@ -85,7 +90,7 @@ Thu May 6 11:40:28 2004 Shugo Maeda <shugo@ruby-lang.org>
Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
+ * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
Don't include the &block parameter if we have explicit
yield parameters.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 65ae853bac..a6d1413b1e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -564,7 +564,7 @@ SRC
/*top*/
static #{type} *t;
SRC
- $defs.push(format("-DHAVE_TYPE_%s", type.upcase))
+ $defs.push(format("-DHAVE_TYPE_%s", type.upcase.tr_s("^A-Z0-9_", "_")))
true
else
false
@@ -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))
+ $defs.push(format("-DSIZEOF_%s", type.upcase.tr_s("^A-Z0-9_", "_")))
end
message(a = size ? "#{size}\n" : "failed\n")
Logging::message "-------------------- %s\n", a