From: theAdib Date: Wed, 29 Nov 2006 08:49:19 +0000 (+0000) Subject: prevent compiling error on gettimeofday on mingw compiler X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=83f36885547e2e95de03bcd66a01721633afc4ce;p=inkscape.git prevent compiling error on gettimeofday on mingw compiler --- diff --git a/buildtool.cpp b/buildtool.cpp index bd221fe1f..8e0fd0e9d 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -8223,11 +8223,11 @@ bool Make::run(const String &target) status("# %s", version().c_str()); status("####################################################"); struct timeval timeStart, timeEnd; - gettimeofday(&timeStart, NULL); + ::gettimeofday(&timeStart, NULL); specifiedTarget = target; if (!run()) return false; - gettimeofday(&timeEnd, NULL); + ::gettimeofday(&timeEnd, NULL); String timeStr = timeDiffString(timeEnd, timeStart); status("####################################################"); status("# BuildTool Completed : %s", timeStr.c_str()); diff --git a/mingwenv.bat b/mingwenv.bat index b5f04350a..e56b06bcf 100755 --- a/mingwenv.bat +++ b/mingwenv.bat @@ -1,5 +1,5 @@ @echo Setting environment variables for MinGw build of Inkscape -set GTK=c:/gtk28 -set GTKDOS=c:\gtk28 +set GTK=c:/gtk210 +set GTKDOS=c:\gtk210 set path=c:\mingw\bin;%GTKDOS%\bin;%path%