[lld] 909d7bf - Fix Windows buildbots

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Sun Nov 17 23:45:52 PST 2019


Author: Rui Ueyama
Date: 2019-11-18T16:45:00+09:00
New Revision: 909d7bf9a7c5eb728f4660541ab33089132409fe

URL: https://github.com/llvm/llvm-project/commit/909d7bf9a7c5eb728f4660541ab33089132409fe
DIFF: https://github.com/llvm/llvm-project/commit/909d7bf9a7c5eb728f4660541ab33089132409fe.diff

LOG: Fix Windows buildbots

`stdout` and `stderr` might be defined as macros, so we needed to
avoid using them as variable names.

Added: 
    

Modified: 
    lld/include/lld/Common/Driver.h

Removed: 
    


################################################################################
diff  --git a/lld/include/lld/Common/Driver.h b/lld/include/lld/Common/Driver.h
index 3edd544cf1d3..0a358d8aff6b 100644
--- 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);
 }
 }
 


        


More information about the llvm-commits mailing list