From 2c096dfa681baaef1d8a435e35361cf241e97696 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Tue, 30 May 2017 18:15:25 +0200 Subject: [PATCH] Issue #550 - K&R/MSVC10 fix - tidy.c --- console/tidy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/console/tidy.c b/console/tidy.c index 90d8b88..bc5b4e8 100644 --- a/console/tidy.c +++ b/console/tidy.c @@ -39,6 +39,9 @@ static FILE* errout = NULL; #if defined(_WIN32) /** On Windows, we will store the original code page here. */ static uint win_cp; /* original Windows code page */ +#if (defined(_MSC_VER) && (_MSC_VER < 1900)) +#define snprintf _snprintf +#endif #endif @@ -1529,8 +1532,8 @@ static void printXMLCrossRefEqConsole(TidyDoc tdoc, /**< The Tidy document. */ if ( hit ) { - localHit = *hit; tmbstr localName; + localHit = *hit; localize_option_names( &localHit ); printf(" %s\n", localName = get_escaped_name(localHit.name1)); free((tmbstr)localHit.name1); @@ -1882,12 +1885,12 @@ int main( int argc, char** argv ) TidyDoc tdoc = tidyCreate(); int status = 0; tmbstr locale = NULL; - tidySetMessageCallback( tdoc, reportCallback); /* experimental group */ uint contentErrors = 0; uint contentWarnings = 0; uint accessWarnings = 0; + tidySetMessageCallback( tdoc, reportCallback); /* experimental group */ errout = stderr; /* initialize to stderr */ /* Set an atexit handler. */