diff options
| author | Christophe Grenier <[email protected]> | 2015-04-11 14:23:16 +0200 |
|---|---|---|
| committer | Christophe Grenier <[email protected]> | 2015-04-11 14:23:16 +0200 |
| commit | 67054372873f2ed5414da7fff1cb5744148289d6 (patch) | |
| tree | a8cd9501bcfc1e1efec8ca6603e7f11b0ad2ec0c /src/file_gif.c | |
| parent | efc94ee87ac3b4e3ecf4fb3ab4adac2ef0a6278f (diff) | |
add gcc_struct attribute to all __packed__ structure
do not use fseeko() with mingw32 gcc compiler
Diffstat (limited to 'src/file_gif.c')
| -rw-r--r-- | src/file_gif.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/file_gif.c b/src/file_gif.c index a4ab1d63..eaa0772f 100644 --- a/src/file_gif.c +++ b/src/file_gif.c @@ -31,6 +31,12 @@ #include "filegen.h" #include "log.h" +#if defined(HAVE_FSEEKO) && !defined(__MINGW32__) +#define my_fseek fseeko +#else +#define my_fseek fseek +#endif + static void register_header_check_gif(file_stat_t *file_stat); static int header_check_gif(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new); static void file_check_gif(file_recovery_t *file_recovery); @@ -74,12 +80,7 @@ static void file_check_gif(file_recovery_t *file_recovery) { const unsigned char gif_footer[2]= {0x00, 0x3b}; unsigned char buffer[2]; - if( -#ifdef HAVE_FSEEKO - fseeko(file_recovery->handle, file_recovery->calculated_file_size-2, SEEK_SET)<0 || -#else - fseek(file_recovery->handle, file_recovery->calculated_file_size-2, SEEK_SET)<0 || -#endif + if(my_fseek(file_recovery->handle, file_recovery->calculated_file_size-2, SEEK_SET)<0 || fread(buffer, 2, 1, file_recovery->handle)!=1 || memcmp(buffer, gif_footer, sizeof(gif_footer))!=0) { |