Merge pull request sass#1435 from saper/mingwrt

Cross compile with MinGW32 runtime
scantist-ossops-m2 · Aug 11, 2015 · 1ebed7a · 1ebed7a
2 parents 354801c + 12954b6
commit 1ebed7a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 28 deletions.
diff --git a/src/file.cpp b/src/file.cpp
@@ -1,4 +1,9 @@
 #ifdef _WIN32
+#ifdef __MINGW32__
+#ifndef off64_t
+#define off64_t _off64_t    /* Workaround for http://sourceforge.net/p/mingw/bugs/2024/ */
+#endif
+#endif
 #include <direct.h>
 #define getcwd _getcwd
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)

diff --git a/src/sass_context.cpp b/src/sass_context.cpp
@@ -1,11 +1,3 @@
-#ifdef _WIN32
-#include <io.h>
-#define LFEED "\n"
-#else
-#include <unistd.h>
-#define LFEED "\n"
-#endif
-
 #include "sass.h"
 
 #include <cstring>
@@ -23,6 +15,8 @@
 #include "ast_fwd_decl.hpp"
 #include "error_handling.hpp"
 
+#define LFEED "\n"
+
 extern "C" {
   using namespace Sass;
 

diff --git a/src/sass_functions.cpp b/src/sass_functions.cpp
@@ -1,9 +1,3 @@
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 #include <cstring>
 #include "util.hpp"
 #include "context.hpp"

diff --git a/src/sass_interface.cpp b/src/sass_interface.cpp
@@ -1,11 +1,3 @@
-#ifdef _WIN32
-#include <io.h>
-#define LFEED "\n"
-#else
-#include <unistd.h>
-#define LFEED "\n"
-#endif
-
 #include "sass.h"
 
 #include <string>
@@ -20,6 +12,7 @@
 #include "error_handling.hpp"
 #include "sass_interface.h"
 
+#define LFEED "\n"
 
 extern "C" {
 

diff --git a/src/sass_values.cpp b/src/sass_values.cpp
@@ -1,9 +1,3 @@
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 #include <cstdlib>
 #include <cstring>
 #include "util.hpp"