From 5c99ee83ad8995205559a6dfa5bb52ba5c70e799 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Mon, 27 Dec 2010 19:34:00 +0000 Subject: * 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 --- ChangeLog | 5 +++++ ext/fiddle/extconf.rb | 1 + test/fiddle/test_fiddle.rb | 10 ++++++++++ 3 files changed, 16 insertions(+) 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 + + * 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 * 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 -- cgit v1.2.3