suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack

Browse Source
This commit is contained in:
jriegel 2014-08-27 22:25:35 +02:00
commit eb734eb6f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Base/FileInfo.cpp
View File

@ -521,15 +521,16 @@ std::vector<Base::FileInfo> FileInfo::getDirectoryContent(void) const
{ {
std::vector<Base::FileInfo> List; std::vector<Base::FileInfo> List;
#if defined (FC_OS_WIN32) #if defined (FC_OS_WIN32)
struct _wfinddata_t dentry; struct _wfinddata_t dentry;
long hFile;
intptr_t hFile;
// Find first directory entry // Find first directory entry
std::wstring wstr = toStdWString(); std::wstring wstr = toStdWString();
wstr += L"/*"; wstr += L"/*";
if ((hFile = _wfindfirst( wstr.c_str(), &dentry)) == -1L) if ((hFile = _wfindfirst( wstr.c_str(), &dentry)) == -1L)
return List; return List;
while (_wfindnext(hFile, &dentry) == 0) while (_wfindnext(hFile, &dentry) == 0)
if (wcscmp(dentry.name,L"..") != 0) if (wcscmp(dentry.name,L"..") != 0)