zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 20:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Compilation errors on Mac OS X.

Browse source 
SVN r2824 (trunk)
This commit is contained in:
Braden Obrzut 2010-09-18 20:13:56 +00:00
parent 20513cff41
commit b50007ecf6
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cmdlib.cpp
View file

@ -1004,7 +1004,8 @@ void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
void ScanDirectory(TArray<FFileList> &list, const char *dirpath) void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
{ {
const char **argv[] = {dirpath, NULL }; char * const argv[] = {new char[strlen(dirpath)+1], NULL };
memcpy(argv[0], dirpath, strlen(dirpath)+1);
FTS *fts; FTS *fts;
FTSENT *ent; FTSENT *ent;
@ -1012,6 +1013,7 @@ void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
if (fts == NULL) if (fts == NULL)
{ {
I_Error("Failed to start directory traversal: %s\n", strerror(errno)); I_Error("Failed to start directory traversal: %s\n", strerror(errno));
delete[] argv[0];
return; return;
} }
while ((ent = fts_read(fts)) != NULL) while ((ent = fts_read(fts)) != NULL)
@ -1037,5 +1039,6 @@ void ScanDirectory(TArray<FFileList> &list, const char *dirpath)
} }
} }
fts_close(fts); fts_close(fts);
delete[] argv[0];
} }
#endif #endif

2
src/p_glnodes.cpp
View file

@ -1077,7 +1077,7 @@ static FString GetCachePath()
FSRef folder; FSRef folder;
if (noErr == FSFindFolder(kLocalDomain, kApplicationSupportFolderType, kCreateFolder, &folder) && if (noErr == FSFindFolder(kLocalDomain, kApplicationSupportFolderType, kCreateFolder, &folder) &&
noErr == FSRefMakePath(&folder, (UInt8*)cpath, PATH_MAX)) noErr == FSRefMakePath(&folder, (UInt8*)path.GetChars(), PATH_MAX))
{ {
path = pathstr; path = pathstr;
} }