From d50391a98461a3940aaed2cea2d0e7970bc926db Mon Sep 17 00:00:00 2001
From: Cameron Moy <camoy@umd.edu>
Date: Mon, 13 Jul 2015 16:31:52 -0400
Subject: [PATCH 1/4] Fix #158 - remove inserted newlines in pre

---
 src/pprint.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pprint.c b/src/pprint.c
index 7294d04..629af64 100644
--- a/src/pprint.c
+++ b/src/pprint.c
@@ -2162,14 +2162,12 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
             PPrintTag( doc, mode, indent, node );
 
             indent = 0;
-            TY_(PFlushLine)( doc, indent );
 
             for ( content = node->content; content; content = content->next )
             {
                 TY_(PPrintTree)( doc, (mode | PREFORMATTED | NOWRAP),
                                  indent, content );
             }
-            PCondFlushLine( doc, indent );
             indent = indprev;
             PPrintEndTag( doc, mode, indent, node );
 

From 33494a4aea444df56857513e17ee34fe92f678b9 Mon Sep 17 00:00:00 2001
From: Geoff McLane <ubuntu@geoffair.info>
Date: Tue, 14 Jul 2015 11:27:15 +0200
Subject: [PATCH 2/4] Bump version for #158 fix by PR #229

---
 version.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.txt b/version.txt
index e16f278..2275c4d 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-5.1.1
-2015.07.13
+5.1.2
+2015.07.14

From 54130dce48c09b8eaf7b57e019662ce0a569c94b Mon Sep 17 00:00:00 2001
From: Geoff McLane <ubuntu@geoffair.info>
Date: Wed, 15 Jul 2015 19:29:53 +0200
Subject: [PATCH 3/4] Default to no DLL if WIN32, 64-bit build

---
 build/win64/build-me.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/win64/build-me.bat b/build/win64/build-me.bat
index d18a706..77e749a 100644
--- a/build/win64/build-me.bat
+++ b/build/win64/build-me.bat
@@ -43,6 +43,7 @@
 @set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64"
 @REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg"
 @REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_CONFIG_FILE="C:\MDOS\tidy5.cfg"
+@set TMPOPTS=%TMPOPTS% -DBUILD_SHARED_LIB:BOOL=OFF
 
 :RPT
 @if "%~1x" == "x" goto GOTCMD

From dfdffd0cb3cc27569e101e0abd1aff9772884115 Mon Sep 17 00:00:00 2001
From: Andrew Dunn <Andrew-Dunn@users.noreply.github.com>
Date: Fri, 7 Aug 2015 17:06:33 +1000
Subject: [PATCH 4/4] Reordered Windows Includes

Moved the <windows.h> include above the "streamio.h" include to fix compilation with the latest Windows SDK.

<winnt.h> now has the following struct. In particular the `CR` member of this struct conflicts with a define in streamio.h.

    typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY {
        DWORD BeginAddress;
        union {
            DWORD UnwindData;
            struct {
                DWORD Flag : 2;
                DWORD FunctionLength : 11;
                DWORD RegF : 3;
                DWORD RegI : 4;
                DWORD H : 1;
                DWORD CR : 2; // This line causes a compile error because CR is redefined in streamio.h
                DWORD FrameSize : 9;
            } DUMMYSTRUCTNAME;
        } DUMMYUNIONNAME;
    } IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY, * PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY;
---
 src/mappedio.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mappedio.c b/src/mappedio.c
index 5efed4c..61cf748 100644
--- a/src/mappedio.c
+++ b/src/mappedio.c
@@ -97,15 +97,15 @@ void TY_(freeFileSource)( TidyInputSource* inp, Bool closeIt )
 
 
 #if defined(_WIN32)
-#include "streamio.h"
-#include "tidy-int.h"
-#include "message.h"
-
-#include <errno.h>
 #if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
 #pragma warning(disable:4115) /* named type definition in parentheses in windows headers */
 #endif
 #include <windows.h>
+#include <errno.h>
+
+#include "streamio.h"
+#include "tidy-int.h"
+#include "message.h"
 
 typedef struct _fp_input_mapped_source
 {