Merge pull request #232 from coxuintel/mac_build

wcwang · web-flow · commit 3e57d8dfc002 · 2019-08-16T16:08:32.000+08:00
Fix macOS build failure on SDK 10.12 and host crash.
diff --git a/platforms/darwin/hax_wrapper.cpp b/platforms/darwin/hax_wrapper.cpp
@@ -64,7 +64,7 @@ extern "C" void hax_log(int level, const char *fmt, ...)
     va_start(args, fmt);
     if (level >= HAX_LOG_DEFAULT) {
         printf("%s", kLogPrefix[level]);
-        printf(fmt, args);
+        vprintf(fmt, args);
     }
     va_end(args);
 }
@@ -74,7 +74,7 @@ extern "C" void hax_panic(const char *fmt, ...)
     va_list args;
     va_start(args, fmt);
     hax_log(HAX_LOGPANIC, fmt, args);
-    panic(fmt, args);
+    (panic)(fmt, args);
     va_end(args);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ extern "C" void hax_log(int level, const char *fmt, ...)`
`64`	`64`	`va_start(args, fmt);`
`65`	`65`	`if (level >= HAX_LOG_DEFAULT) {`
`66`	`66`	`printf("%s", kLogPrefix[level]);`
`67`		`- printf(fmt, args);`
	`67`	`+ vprintf(fmt, args);`
`68`	`68`	`}`
`69`	`69`	`va_end(args);`
`70`	`70`	`}`
`@@ -74,7 +74,7 @@ extern "C" void hax_panic(const char *fmt, ...)`
`74`	`74`	`va_list args;`
`75`	`75`	`va_start(args, fmt);`
`76`	`76`	`hax_log(HAX_LOGPANIC, fmt, args);`
`77`		`- panic(fmt, args);`
	`77`	`+ (panic)(fmt, args);`
`78`	`78`	`va_end(args);`
`79`	`79`	`}`
`80`	`80`