summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-11-22 13:01:16 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-11-22 13:01:16 -0800
commitdc28c6179e124bada0d343651ed9b8e905080270 (patch)
tree14291c2cd411dbd3cf7fb482859449f4668ec096
parent8af9a318340e34d083f26b9c7a253e570d9b930e (diff)
parent28a5726ad7b7a42d813932d1ea4da3ef84a96d45 (diff)
downloadffi-yajl-dc28c6179e124bada0d343651ed9b8e905080270.tar.gz
Merge pull request #30 from electrawn/master
Cygwin detection https://github.com/opscode/ffi-yajl/issues/10
-rw-r--r--ext/ffi_yajl/ext/encoder/extconf.rb2
-rw-r--r--ext/ffi_yajl/ext/parser/extconf.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb
index bf9c839..f7f0116 100644
--- a/ext/ffi_yajl/ext/encoder/extconf.rb
+++ b/ext/ffi_yajl/ext/encoder/extconf.rb
@@ -23,7 +23,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
end
def windows?
- !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+ !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
end
if windows?
diff --git a/ext/ffi_yajl/ext/parser/extconf.rb b/ext/ffi_yajl/ext/parser/extconf.rb
index d090638..0b13bca 100644
--- a/ext/ffi_yajl/ext/parser/extconf.rb
+++ b/ext/ffi_yajl/ext/parser/extconf.rb
@@ -23,7 +23,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
end
def windows?
- !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+ !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
end
if windows?