From 0c6e611c1502f060cf2cc5435ff529721cae700c Mon Sep 17 00:00:00 2001
From: Andrey Taritsyn <taritsyn@gmail.com>
Date: Wed, 11 Nov 2015 22:31:52 +0300
Subject: [PATCH 1/2] Fixes for Windows version

---
 src/functions.cpp           | 3 +++
 win/libsass.targets         | 3 +++
 win/libsass.vcxproj.filters | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/src/functions.cpp b/src/functions.cpp
index 1aa1385de3..274498e236 100644
--- a/src/functions.cpp
+++ b/src/functions.cpp
@@ -6,6 +6,9 @@
 #include "constants.hpp"
 #include "to_string.hpp"
 #include "inspect.hpp"
+#ifdef _WIN32
+#include "inttypes.h"
+#endif
 #include "extend.hpp"
 #include "eval.hpp"
 #include "util.hpp"
diff --git a/win/libsass.targets b/win/libsass.targets
index a54fe9bfea..91115bf0f5 100644
--- a/win/libsass.targets
+++ b/win/libsass.targets
@@ -36,7 +36,10 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\position.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\prelexer.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\remove_placeholders.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_context.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_functions.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_util.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\source_map.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\subset_map.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp" />
diff --git a/win/libsass.vcxproj.filters b/win/libsass.vcxproj.filters
index 83c99a9d7a..a6759842fe 100644
--- a/win/libsass.vcxproj.filters
+++ b/win/libsass.vcxproj.filters
@@ -126,9 +126,18 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\remove_placeholders.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_context.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_functions.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_util.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\source_map.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

From 11b907c69bd318680251d6fd1606227ca5ec7368 Mon Sep 17 00:00:00 2001
From: Andrey Taritsyn <taritsyn@gmail.com>
Date: Fri, 13 Nov 2015 11:17:50 +0300
Subject: [PATCH 2/2] Update functions.cpp

---
 src/functions.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/functions.cpp b/src/functions.cpp
index 274498e236..48352da486 100644
--- a/src/functions.cpp
+++ b/src/functions.cpp
@@ -6,9 +6,6 @@
 #include "constants.hpp"
 #include "to_string.hpp"
 #include "inspect.hpp"
-#ifdef _WIN32
-#include "inttypes.h"
-#endif
 #include "extend.hpp"
 #include "eval.hpp"
 #include "util.hpp"
@@ -27,6 +24,10 @@
 #include <random>
 #include <set>
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#include "inttypes.h"
+#endif
+
 #ifdef __MINGW32__
 #include "windows.h"
 #include "wincrypt.h"