Fix for file UI on Blackberry

This commit is contained in:
Sacha committed 2012-11-15 01:40:44 +10:00
1 parent 8c9f9ae1cf
commit 4aed48d29f
2 files changed
+12 -11

No files matched your search

+8 -4
View File
@@ -417,14 +417,16 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
FSTEntry entry;
const std::string virtualName(ffd.cFileName);
#else
struct dirent dirent, *result = NULL;
struct dirent_large { struct dirent entry; char padding[FILENAME_MAX+1]; };
struct dirent_large diren;
struct dirent *result = NULL;
DIR *dirp = opendir(directory.c_str());
if (!dirp)
return 0;
// non windows loop
while (!readdir_r(dirp, &dirent, &result) && result)
while (!readdir_r(dirp, (dirent*)&diren, &result) && result)
{
FSTEntry entry;
const std::string virtualName(result->d_name);
@@ -534,11 +536,13 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
if (!File::Exists(source_path)) return;
if (!File::Exists(dest_path)) File::CreateFullPath(dest_path);
struct dirent dirent, *result = NULL;
struct dirent_large { struct dirent entry; char padding[FILENAME_MAX+1]; };
struct dirent_large diren;
struct dirent *result = NULL;
DIR *dirp = opendir(source_path.c_str());
if (!dirp) return;
while (!readdir_r(dirp, &dirent, &result) && result)
while (!readdir_r(dirp, (dirent*) &diren, &result) && result)
{
const std::string virtualName(result->d_name);
// check for "." and ".."
+4 -7
View File
@@ -26,13 +26,10 @@ endif()
include(FindSDL)
if (0) # RELEASE
add_definitions(-O2)
else() # DEBUG
add_definitions(-g)
add_definitions(-DUSE_PROFILER)
add_definitions(-D_DEBUG)
endif()
#add_definitions(-O2)
add_definitions(-g)
add_definitions(-DUSE_PROFILER)
add_definitions(-D_DEBUG)
add_definitions(-DSDL)
# Apple can't build the SDL .m file with -std=gnu++0x