Fix Windows buildbots

rui314 · rui314 · commit 909d7bf9a7c5 · 2019-11-18T16:45:00.000+09:00
`stdout` and `stderr` might be defined as macros, so we needed to
avoid using them as variable names.
diff --git a/lld/include/lld/Common/Driver.h b/lld/include/lld/Common/Driver.h
@@ -15,27 +15,27 @@
 namespace lld {
 namespace coff {
 bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
-          llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);
+          llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);
 }
 
 namespace mingw {
 bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
-          llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);
+          llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);
 }
 
 namespace elf {
 bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
-          llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);
+          llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);
 }
 
 namespace mach_o {
 bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
-          llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);
+          llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);
 }
 
 namespace wasm {
 bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
-          llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);
+          llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);
 }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,27 +15,27 @@`
`15`	`15`	`namespace lld {`
`16`	`16`	`namespace coff {`
`17`	`17`	`bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,`
`18`		`- llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);`
	`18`	`+ llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`namespace mingw {`
`22`	`22`	`bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,`
`23`		`- llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);`
	`23`	`+ llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`namespace elf {`
`27`	`27`	`bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,`
`28`		`- llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);`
	`28`	`+ llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`namespace mach_o {`
`32`	`32`	`bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,`
`33`		`- llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);`
	`33`	`+ llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`namespace wasm {`
`37`	`37`	`bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,`
`38`		`- llvm::raw_ostream &stdout, llvm::raw_ostream &stderr);`
	`38`	`+ llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`