summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/mkmf.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd103f3ad..96b753bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 20 12:22:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (have_type): do not check pointer to incomplete type,
+ which always get compiled.
+ [ruby-list:39683]
+
Wed May 19 23:45:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/inlinetest.rb (InlineTest::loadtest): requiring library with
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ddcb53d52..c8e98fb4e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -574,7 +574,7 @@ end
def have_type(type, header = nil, opt = "", &b)
checking_for type do
header = cpp_include(header)
- if try_compile(<<"SRC", opt, &b) or try_compile(<<"SRC", opt, &b)
+ if try_compile(<<"SRC", opt, &b) or (/\A\w+\z/n =~ type && try_compile(<<"SRC", opt, &b))
#{COMMON_HEADERS}
#{header}
/*top*/
@@ -585,7 +585,7 @@ SRC
/*top*/
static #{type} *t;
SRC
- $defs.push(format("-DHAVE_TYPE_%s", type.upcase.tr_s("^A-Z0-9_", "_")))
+ $defs.push(format("-DHAVE_TYPE_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_")))
true
else
false