emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Andrew-Dunn-patch-1' into issue-228.

Browse source 
That is reordering windows includes per #234

In general the order of includes should be system <headers>,
then local "headers", except perhaps for the ocassional local
"version" or "config" header...

Resolved conflicts in src/pprint.c by reverting to current master, and in
version.txt by increasing the version.
This commit is contained in:
Geoff McLane 2015-08-10 18:42:58 +02:00
parent 652d4b464b dfdffd0cb3
commit 1d67dc940a
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/win64/build-me.bat
View file

@ -43,6 +43,7 @@
@set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64" @set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64"
@REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg" @REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg"
@REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_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 :RPT
@if "%~1x" == "x" goto GOTCMD @if "%~1x" == "x" goto GOTCMD

10
src/mappedio.c
View file

@ -97,15 +97,15 @@ void TY_(freeFileSource)( TidyInputSource* inp, Bool closeIt )
#if defined(_WIN32) #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 */ #if defined(_MSC_VER) && (_MSC_VER < 1300) /* less than msvc++ 7.0 */
#pragma warning(disable:4115) /* named type definition in parentheses in windows headers */ #pragma warning(disable:4115) /* named type definition in parentheses in windows headers */
#endif #endif
#include <windows.h> #include <windows.h>
#include <errno.h>
#include "streamio.h"
#include "tidy-int.h"
#include "message.h"
typedef struct _fp_input_mapped_source typedef struct _fp_input_mapped_source
{ {

4
version.txt
View file

@ -1,2 +1,2 @@
5.1.4 5.1.5
2015.07.31 2015.08.10