aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-27 19:34:00 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-27 19:34:00 +0000
commit5c99ee83ad8995205559a6dfa5bb52ba5c70e799 (patch)
tree5032afba54ba8ddf75a880fd56269906dc433c1f
parentb66fc7ac3cdb02c5fe753d5ca45274c5230f7567 (diff)
downloadruby-5c99ee83ad8995205559a6dfa5bb52ba5c70e799.tar.gz
* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
Thanks Jon Forums! [ruby-core:33923] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/fiddle/extconf.rb1
-rw-r--r--test/fiddle/test_fiddle.rb10
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 10a2418887..8becc42c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 28 04:32:37 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/extconf.rb: check for windows.h while building fiddle.
+ Thanks Jon Forums! [ruby-core:33923]
+
Tue Dec 28 01:45:12 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* NEWS: Add Zlib.deflate and Zlib.inflate.
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 03b0ac2765..3dcd914ddf 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -18,6 +18,7 @@ unless have_library('ffi') || have_library('libffi')
end
have_header 'sys/mman.h'
+have_header 'windows.h'
create_makefile 'fiddle'
diff --git a/test/fiddle/test_fiddle.rb b/test/fiddle/test_fiddle.rb
index fa19aaff07..625aaf940d 100644
--- a/test/fiddle/test_fiddle.rb
+++ b/test/fiddle/test_fiddle.rb
@@ -16,4 +16,14 @@ class TestFiddle < Fiddle::TestCase
assert_equal(DL.const_get(name), Fiddle.const_get(name))
end
end
+
+ def test_windows_constant
+ require 'rbconfig'
+ if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+ assert Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'true' on Windows platforms"
+ else
+ refute Fiddle::WINDOWS, "Fiddle::WINDOWS should be 'false' on non-Windows platforms"
+ end
+ end
+
end