Merge pull request #12214 from JuliaLang/tk/fixmsvc

Fix MSVC build
JuliaLang · Jul 20, 2015 · 298231e · 298231e
2 parents 673bb86 + c63e3cc
commit 298231e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/gc.c b/src/gc.c
@@ -28,6 +28,10 @@
 #endif
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // manipulating mark bits
 
 #define GC_CLEAN 0 // freshly allocated
@@ -252,10 +256,6 @@ static void post_mark(arraylist_t *list, int dryrun);
 
 #include "gc-debug.c"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int jl_in_gc; // referenced from switchto task.c
 static int jl_gc_finalizers_inhibited; // don't run finalizers during codegen #11956
 

diff --git a/src/jl_uv.c b/src/jl_uv.c
@@ -27,6 +27,9 @@
 #include <io.h>
 #define write _write
 #endif
+#if defined(_COMPILER_MICROSOFT_) && !defined(_Static_assert)
+#define _Static_assert static_assert
+#endif
 
 #ifdef __cplusplus
 #include <cstring>