#2015 Allow compilation on MSVC by avoiding winsocket redefinitions

Note: jaro_winkler is a native gem dependency of rubocop that currently doesn't supports C89 (MSVC) I'm using conan-provided system dependencies since package deps won't work
sparklemotion · Mar 30, 2020 · 28aca9b · 28aca9b
1 parent e587654
commit 28aca9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,7 @@ source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.5.0"
 
+gem 'jaro_winkler', '= 1.5.4', :github => 'jmarrec/jaro_winkler', :ref => 'f1ca425fdef06603e5c65b09c5b681f805e1e297'
 gem "concourse", "~>0.30", :group => [:development, :test]
 gem "hoe", "~>3.22", ">=3.22.1", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]

diff --git a/ext/nokogiri/nokogiri.h b/ext/nokogiri/nokogiri.h
@@ -1,6 +1,18 @@
 #ifndef NOKOGIRI_NATIVE
 #define NOKOGIRI_NATIVE
 
+#if _MSC_VER
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif /* WIN32_LEAN_AND_MEAN */
+#ifndef WIN32
+#define WIN32
+#endif /* WIN32 */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>