From 6c7af5b06058660d26fcbe389ce28aa7135b2008 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Thu, 24 Mar 2016 16:29:35 -0700 Subject: [PATCH] Build fix for Cygwin relating to itoa(); add touchconfig.sh to fix buildsys file timestamps. --- src/core/errorutil.cpp | 9 +++++---- touchconfig.sh | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/core/errorutil.cpp create mode 100755 touchconfig.sh diff --git a/src/core/errorutil.cpp b/src/core/errorutil.cpp old mode 100644 new mode 100755 index 53d15e1..a07c127 --- a/src/core/errorutil.cpp +++ b/src/core/errorutil.cpp @@ -43,14 +43,15 @@ #if IS_UNIX namespace //unique { - - TCHAR* _itot( int value, TCHAR* string, int radix) + TCHAR* tw_itot( int value, TCHAR* string, int radix) { _stprintf( string, "%d", value ); return string; } } -#endif +#else + #define tw_itot _itot +#endif //IS_UNIX eInternal::eInternal(TCHAR* sourceFile, int lineNum) : eError(_T("")) @@ -60,7 +61,7 @@ eInternal::eInternal(TCHAR* sourceFile, int lineNum) mMsg = _T("File: "); mMsg += sourceFile; mMsg += _T(" Line: "); - mMsg += _itot(lineNum, buf, 10); + mMsg += tw_itot(lineNum, buf, 10); } //============================================================================= diff --git a/touchconfig.sh b/touchconfig.sh new file mode 100755 index 0000000..2a341bc --- /dev/null +++ b/touchconfig.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# On a fresh clone/checkout/untar/etc., sometimes make thinks +# automake files are out of sync because they all have the same timestamp, +# and insists they need to be regenerated, though they really don't. +# This script bumps the timestamps on the right files in the right order, +# such that they don't all match, and make can proceed on its way. +touch configure.ac aclocal.m4 configure Makefile.am Makefile.in +