Merge pull request #128 from CapitalID/winx64_fixes

Fix sassc build and warnings
sass · Aug 4, 2015 · 5c78c73 · 5c78c73
2 parents 3565df7 + bb67d86
commit 5c78c73
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
   - gem install sass
   - git clone https://github.com/sass/libsass.git
   - cd libsass && git submodule init && git submodule update && cd ..
-  - export SASS_LIBSASS_PATH=libsass
+  - export SASS_LIBSASS_PATH=$TRAVIS_BUILD_DIR/libsass
 
 script:
   - ./script/ci-build-libsass

diff --git a/sassc.c b/sassc.c
@@ -1,3 +1,9 @@
+#ifdef _MSC_VER
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS 1
+#endif
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -199,7 +205,11 @@ int main(int argc, char** argv) {
             break;
         case 'I':
             if (!include_paths) {
-                include_paths = strdup(optarg);
+#ifdef _MSC_VER
+				include_paths = _strdup(optarg);
+#else
+				include_paths = strdup(optarg);
+#endif
             } else {
                 char *old_paths = include_paths;
                 include_paths = malloc(strlen(old_paths) + 1 + strlen(optarg) + 1);

diff --git a/win/posix/getopt.c b/win/posix/getopt.c
@@ -344,8 +344,16 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
 	 * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
 	 *                 optreset != 0 for GNU compatibility.
 	 */
-	if (posixly_correct == -1 || optreset != 0)
+	if (posixly_correct == -1 || optreset != 0) {
+#ifdef _MSC_VER
+		size_t requiredSize;
+
+		getenv_s(&requiredSize, NULL, 0, "POSIXLY_CORRECT");
+		posixly_correct = requiredSize > 0;
+#else
 		posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+#endif
+	}
 	if (*options == '-')
 		flags |= FLAG_ALLARGS;
 	else if (posixly_correct || *options == '+')