diff options
Diffstat (limited to 'pdf/goo')
-rw-r--r-- | pdf/goo/gfile.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pdf/goo/gfile.cc b/pdf/goo/gfile.cc index b4fb616..11f5cf6 100644 --- a/pdf/goo/gfile.cc +++ b/pdf/goo/gfile.cc @@ -10,13 +10,7 @@ #include <aconf.h> -#ifdef WIN32 - extern "C" { -# ifndef _MSC_VER -# include <kpathsea/win32lib.h> -# endif - } -#else // !WIN32 +#ifndef WIN32 # if defined(MACOS) # include <sys/stat.h> # elif !defined(ACORN) @@ -647,10 +641,14 @@ GDirEntry *GDir::getNextEntry() { GDirEntry *e; #if defined(WIN32) - e = new GDirEntry(path->getCString(), ffd.cFileName, doStat); - if (hnd && !FindNextFile(hnd, &ffd)) { - FindClose(hnd); - hnd = NULL; + if (hnd) { + e = new GDirEntry(path->getCString(), ffd.cFileName, doStat); + if (hnd && !FindNextFile(hnd, &ffd)) { + FindClose(hnd); + hnd = NULL; + } + } else { + e = NULL; } #elif defined(ACORN) #elif defined(MACOS) @@ -694,6 +692,7 @@ void GDir::rewind() { tmp = path->copy(); tmp->append("/*.*"); hnd = FindFirstFile(tmp->getCString(), &ffd); + delete tmp; #elif defined(ACORN) #elif defined(MACOS) #else |