msvc fixes

declare vasprintf before using

use JL_GC_PUSH1 instead of JL_GC_PUSH, latter requires C99 vararg macros

use __alignof instead of __alignof__ for msvc

remove define for _isnan, no longer seems to be necessary

disable ASM_COPY_STACKS for MSVC

Don't include valgrind.h for MSVC

use _write instead of write

src/builtins.c

@@ -39,6 +39,8 @@ DLLEXPORT void NORETURN jl_error(const char *str)
     jl_throw(jl_new_struct(jl_errorexception_type, msg));
 }
 
+extern int vasprintf(char **str, const char *fmt, va_list ap);
+
 static void NORETURN jl_vexceptionf(jl_datatype_t *exception_type, const char *fmt, va_list args)
 {
     if (exception_type == NULL) {

src/codegen.cpp

@@ -160,6 +160,10 @@ extern void _chkstk(void);
 #endif
 }
 
+#if defined(_COMPILER_MICROSOFT_) && !defined(__alignof__)
+#define __alignof__ __alignof
+#endif
+
 #define DISABLE_FLOAT16
 
 // llvm state
@@ -791,7 +795,7 @@ static Function *jl_cfunction_object(jl_function_t *f, jl_value_t *rt, jl_value_
 
     uint64_t isref = 0; // bit vector of which argument types are a subtype of Type{Ref{T}}
     jl_value_t *sigt; // type signature with Ref{} annotations removed
-    JL_GC_PUSH(&sigt);
+    JL_GC_PUSH1(&sigt);
     sigt = (jl_value_t*)jl_alloc_tuple(nargs);
     for (i = 0; i < nargs; i++) {
         jl_value_t *ati = jl_tupleref(argt, i);

src/dump.c

@@ -5,8 +5,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "valgrind.h"
-
 #include "julia.h"
 #include "julia_internal.h"
 #include "builtin_proto.h"
@@ -15,6 +13,12 @@
 #include <dlfcn.h>
 #endif
 
+#ifndef _COMPILER_MICROSOFT_
+#include "valgrind.h"
+#else
+#define RUNNING_ON_VALGRIND 0
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/jl_uv.c

@@ -29,6 +29,11 @@
 #include "support/ios.h"
 #include "uv.h"
 
+#if defined(_COMPILER_MICROSOFT_) && !defined(write)
+#include <io.h>
+#define write _write
+#endif
+
 #ifdef __cplusplus
 #include <cstring>
 extern "C" {

src/support/dtypes.h

@@ -37,10 +37,6 @@
 
 #endif /* !_COMPILER_MINGW_ */
 
-#if defined(_COMPILER_MICROSOFT_)
-#define isnan _isnan
-#endif /* _COMPILER_MICROSOFT_ */
-
 #endif /* _OS_WINDOWS_ */
 
 

src/task.c

@@ -152,7 +152,7 @@ jl_gcframe_t *jl_pgcstack = NULL;
 #ifdef COPY_STACKS
 static jl_jmp_buf * volatile jl_jmp_target;
 
-#if defined(_CPU_X86_64_) || defined(_CPU_X86_)
+#if (defined(_CPU_X86_64_) || defined(_CPU_X86_)) && !defined(_COMPILER_MICROSOFT_)
 #define ASM_COPY_STACKS
 #endif
 void *jl_stackbase;