diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 07:48:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 07:48:32 +0400 |
commit | bfcd1afe9c810621eef534832973dcd06010b388 (patch) | |
tree | 1b65222594e3892551b7f8c41ce99e3e925b8444 /source/blender/blenlib/intern/fileops.c | |
parent | b163e19b8df818becbd97c57a55c5a4e0e900da1 (diff) |
compile fix: linux BLI_gzopen declare was conflicting.
Diffstat (limited to 'source/blender/blenlib/intern/fileops.c')
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 9527ec9466b..9c53048dc5b 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -202,12 +202,12 @@ int BLI_file_touch(const char *file) static char str[MAXPATHLEN+12]; -FILE * BLI_fopen(const char * filename, const char * mode) +FILE *BLI_fopen(const char *filename, const char *mode) { return ufopen(filename, mode); } -gzFile BLI_gzopen(const char * filename, const char * mode) +gzFile BLI_gzopen(const char *filename, const char *mode) { gzFile gzfile; int fi; @@ -550,12 +550,12 @@ static int delete_single_file(const char *from, const char *UNUSED(to)) return recursiveOp_Callback_OK; } -FILE * BLI_fopen(const char * filename, const char * mode) +FILE *BLI_fopen(const char *filename, const char *mode) { return fopen(filename, mode); } -gzFile BLI_gzopen(const char * filename, const char * mode) +void *BLI_gzopen(const char *filename, const char *mode) { return gzopen(filename, mode); } |