diff options
| author | theAdib <theAdib@users.sourceforge.net> | 2006-11-29 08:49:19 +0000 |
|---|---|---|
| committer | theAdib <theAdib@users.sourceforge.net> | 2006-11-29 08:49:19 +0000 |
| commit | e9e5583886a2dd9cfbc48e086f23b89df425cfa2 (patch) | |
| tree | cec73f581ef3bac45eead858410f876955a61e62 | |
| parent | 'backup' commit. Added widgets to C++-find dialog. Work not finished. (diff) | |
| download | inkscape-e9e5583886a2dd9cfbc48e086f23b89df425cfa2.tar.gz inkscape-e9e5583886a2dd9cfbc48e086f23b89df425cfa2.zip | |
prevent compiling error on gettimeofday on mingw compiler
(bzr r2053)
| -rw-r--r-- | buildtool.cpp | 4 | ||||
| -rwxr-xr-x | mingwenv.bat | 4 |
2 files changed, 4 insertions, 4 deletions
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% |