summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-15 08:16:33 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-15 08:16:33 +0000
commit6e10636d32a7b90f0636cfb9cda42ca68350a6ba (patch)
tree5a7fc18bdf17bc4051147d08888df72559ebe309
parent77f0c30612e4b3c924018c272dcfe33f0a5bcc0a (diff)
* ext/fiddle/extconf.rb: De Morgan's laws.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/fiddle/extconf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 99bc4caef2..773026956d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 15 17:14:58 2010 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/fiddle/extconf.rb: De Morgan's laws.
+
Tue Jun 15 12:09:00 2010 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index e2e1ea6d16..c80a1f9a83 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -4,7 +4,7 @@ require 'mkmf'
dir_config 'libffi'
-unless pkg_config("libffi") and have_header('ffi.h')
+unless pkg_config("libffi") or have_header('ffi.h')
if have_header('ffi/ffi.h')
$defs.push(format('-DUSE_HEADER_HACKS'))
else