prevent compiling error on gettimeofday on mingw compiler

diff --git a/buildtool.cpp b/buildtool.cpp
index bd221fe1fd6e468cbc2a753343bca87feec0aaeb..8e0fd0e9da1735b0b3946728240f5f98df2e1c59 100644 (file)
--- 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 b5f04350a789b269a3c5dbbc5652dacf3888c99f..e56b06bcf5468c47128f4a348a54106941929d5a 100755 (executable)
--- 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%