liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed OSX/Unix compatability problem in OverwriteOutputFile

Browse Source 
There is a problem in gtk g_remove on Unix/OSX, as it just redefines g_remove to remove without giving a namespace. This may collide if your program defines a remove(char*) as well.
This commit is contained in:
Oliver Duis 2010-10-18 10:53:52 +02:00
parent 49c42c9242
commit 3d288c971b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/batchqueue.cc
View File

@ -351,12 +351,13 @@ Glib::ustring BatchQueue::autoCompleteFileName (const Glib::ustring& fileName, c
int fileExists=Glib::file_test (fname, Glib::FILE_TEST_EXISTS); int fileExists=Glib::file_test (fname, Glib::FILE_TEST_EXISTS);
/*if (inOverwriteMode && fileExists) { if (inOverwriteMode && fileExists) {
if (g_remove(safe_locale_from_utf8(fname).c_str ()) == -1) // do NOT use g_remove as it has compiler problems on Unix and OSX (GTK namespace problem)
if (::remove(safe_locale_from_utf8(fname).c_str ()) == -1)
inOverwriteMode = false; // failed to delete- revert to old naming scheme inOverwriteMode = false; // failed to delete- revert to old naming scheme
else else
fileExists = false; // deleted now fileExists = false; // deleted now
}*/ }
if (!fileExists) { if (!fileExists) {
return fname; return fname;