Adding new line to error/warning message on Windows and fixing some typos.

This commit is contained in:
Dmitry Babokin
2013-05-01 20:22:01 +02:00
parent 3e18cec691
commit 549655bff4
3 changed files with 4 additions and 3 deletions

View File

@@ -3,7 +3,7 @@
REM If LLVM_INSTALL_DIR isn't set globally in your environment, REM If LLVM_INSTALL_DIR isn't set globally in your environment,
REM it can be set here_ REM it can be set here_
REM set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev REM set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev
REM set LLVM_VERSION=3.2 REM set LLVM_VERSION=LLVM_3_2
REM Both the LLVM binaries and python need to be in the path REM Both the LLVM binaries and python need to be in the path
set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin

View File

@@ -968,7 +968,7 @@ Module::writeOutput(OutputType outputType, const char *outFileName,
return 1; return 1;
} }
if (fileType != NULL) if (fileType != NULL)
Warning(SourcePos(), "Warning: emitting %s file, but filename \"%s\" " Warning(SourcePos(), "Emitting %s file, but filename \"%s\" "
"has suffix \"%s\"?", fileType, outFileName, suffix); "has suffix \"%s\"?", fileType, outFileName, suffix);
} }
@@ -2325,7 +2325,7 @@ Module::CompileAndOutput(const char *srcFile,
} }
else { else {
if (outputType == CXX) { if (outputType == CXX) {
Error(SourcePos(), "Illegal to specify more then one target when " Error(SourcePos(), "Illegal to specify more than one target when "
"compiling C++ output."); "compiling C++ output.");
return 1; return 1;
} }

View File

@@ -232,6 +232,7 @@ static void
lPrintWithWordBreaks(const char *buf, int indent, int columnWidth, FILE *out) { lPrintWithWordBreaks(const char *buf, int indent, int columnWidth, FILE *out) {
#ifdef ISPC_IS_WINDOWS #ifdef ISPC_IS_WINDOWS
fputs(buf, out); fputs(buf, out);
fputs("\n", out);
#else #else
int column = 0; int column = 0;
int width = std::max(40, columnWidth - 2); int width = std::max(40, columnWidth - 2);