diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 10:38:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 10:38:43 +0400 |
| commit | fcc807f2948b6a88af573f63b9bb5aaeb14f8ca2 (patch) | |
| tree | a0603804fe2128ec3ca0aec3e2cd65d3fc5be40c /source/blender | |
| parent | 384948908afd5567d6c730a8045a368e8c08e436 (diff) | |
code cleanup: remove unused member of direntry struct, also add include for building on osx.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_fileops_types.h | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 5 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_fileops_types.h b/source/blender/blenlib/BLI_fileops_types.h index 1c6463eb6ea..a7372c01e52 100644 --- a/source/blender/blenlib/BLI_fileops_types.h +++ b/source/blender/blenlib/BLI_fileops_types.h @@ -42,7 +42,6 @@ typedef unsigned int mode_t; struct ImBuf; struct direntry { - char *string; mode_t type; char *relname; char *path; diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 22558fca1c5..cee92888cce 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -434,9 +434,6 @@ static void bli_adddirstrings(struct BuildDirCtx *dir_ctx) BLI_snprintf(buf, sizeof(buf), "%s %s %s %7s %s %s %10s %s", file->mode1, file->mode2, file->mode3, file->owner, file->date, file->time, size, file->relname); - - file->string = BLI_strdup(buf); - /* FIXME: not actually used anywhere, why bother to set it up? */ } } @@ -480,8 +477,6 @@ void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries) MEM_freeN(entry->relname); if (entry->path) MEM_freeN(entry->path); - if (entry->string) - MEM_freeN(entry->string); /* entry->poin assumed not to point to anything needing freeing here */ } diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 2e910e38871..974c2555ee5 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -32,6 +32,7 @@ #include "BLO_sys_types.h" #include "BKE_global.h" +#include "BLI_utildefines.h" #include "BLI_dynstr.h" #include "BLI_path_util.h" |