Merge pull request #3525 from compnerd/windows-argc-argv-indirection

gribozavr · web-flow · commit bcab1aacccfa · 2016-07-15T01:25:27.000-07:00
stdlib: repair windows build
diff --git a/stdlib/public/stubs/CommandLine.cpp b/stdlib/public/stubs/CommandLine.cpp
@@ -90,8 +90,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   return outBuf;
 }
 #elif defined (_MSC_VER)
-extern int *__argc;
-extern char **__argv;
+#include <stdlib.h>
 
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
 extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {`
`90`	`90`	`return outBuf;`
`91`	`91`	`}`
`92`	`92`	`#elif defined (_MSC_VER)`
`93`		`-extern int *__argc;`
`94`		`-extern char **__argv;`
	`93`	`+#include <stdlib.h>`
`95`	`94`
`96`	`95`	`SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE`
`97`	`96`	`extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {`