From 549655bff408bd58eb65b1cc333bda7e55da5345 Mon Sep 17 00:00:00 2001
From: Dmitry Babokin <babokin@gmail.com>
Date: Wed, 1 May 2013 20:22:01 +0200
Subject: [PATCH 1/2] Adding new line to error/warning message on Windows and
 fixing some typos.

---
 buildispc.bat | 2 +-
 module.cpp    | 4 ++--
 util.cpp      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildispc.bat b/buildispc.bat
index ba606faa..da155340 100644
--- a/buildispc.bat
+++ b/buildispc.bat
@@ -3,7 +3,7 @@
 REM If LLVM_INSTALL_DIR isn't set globally in your environment,
 REM it can be set here_
 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
 set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin
diff --git a/module.cpp b/module.cpp
index d323a56b..910a3f27 100644
--- a/module.cpp
+++ b/module.cpp
@@ -968,7 +968,7 @@ Module::writeOutput(OutputType outputType, const char *outFileName,
           return 1;
         }
         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);
     }
 
@@ -2325,7 +2325,7 @@ Module::CompileAndOutput(const char *srcFile,
     }
     else {
         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.");
             return 1;
         }
diff --git a/util.cpp b/util.cpp
index da7a5ebe..dbea9517 100644
--- a/util.cpp
+++ b/util.cpp
@@ -232,6 +232,7 @@ static void
 lPrintWithWordBreaks(const char *buf, int indent, int columnWidth, FILE *out) {
 #ifdef ISPC_IS_WINDOWS
     fputs(buf, out);
+    fputs("\n", out);
 #else
     int column = 0;
     int width = std::max(40, columnWidth - 2);

From 32be338f60bf5e711380a8f659de2dc945761314 Mon Sep 17 00:00:00 2001
From: Dmitry Babokin <babokin@gmail.com>
Date: Thu, 2 May 2013 00:05:17 +0200
Subject: [PATCH 2/2] Minor indentation fix

---
 builtins.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builtins.cpp b/builtins.cpp
index b8b5ac59..57ce2333 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -974,7 +974,8 @@ DefineStdlib(SymbolTable *symbolTable, llvm::LLVMContext *ctx, llvm::Module *mod
         // If the user wants the standard library to be included, parse the
         // serialized version of the stdlib.ispc file to get its
         // definitions added.
-      if (g->target->getISA() == Target::GENERIC&&g->target->getVectorWidth()!=1) { // 1 wide uses x86 stdlib
+        if (g->target->getISA() == Target::GENERIC &&
+            g->target->getVectorWidth() != 1) { // 1 wide uses x86 stdlib
             extern char stdlib_generic_code[];
             yy_scan_string(stdlib_generic_code);
             yyparse();