Ignore:
Timestamp:
Nov 5, 2014, 1:23:27 AM (5 years ago)
Author:
Sam Hocevar
Message:

win32: update to newer mingw compiler version.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • zzuf/trunk/src/libzzuf/lib-stream.c

    r4810 r4888  
    5353#include "fd.h"
    5454
     55#if defined HAVE_FPOS64_T
     56#   define FPOS64_T fpos64_t
     57#else
     58#   define FPOS64_T fpos_t
     59#endif
     60
    5561#if defined HAVE___SREFILL
    5662#undef __srefill
     
    102108#endif
    103109#if defined HAVE_FSETPOS64
    104 static int     (*ORIG(fsetpos64))(FILE *stream, const fpos64_t *pos);
     110static int     (*ORIG(fsetpos64))(FILE *stream, const FPOS64_T *pos);
    105111#endif
    106112#if defined HAVE___FSETPOS64
    107 static int     (*ORIG(__fsetpos64)) (FILE *stream, const fpos64_t *pos);
     113static int     (*ORIG(__fsetpos64)) (FILE *stream, const FPOS64_T *pos);
    108114#endif
    109115static void    (*ORIG(rewind))   (FILE *stream);
     
    387393    } while(0)
    388394
     395#if HAVE_FPOS64_T
     396#   define FPOS_T_TO_INT64_T(x) ((int64_t)FPOS64_CAST(x))
     397#else
     398#   define FPOS_T_TO_INT64_T(x) ((int64_t)(x))
     399#endif
     400
    389401#define ZZ_FSETPOS(myfsetpos) \
    390402    do \
     
    413425                         get_stream_cnt(stream) + get_stream_off(stream)); \
    414426        } \
    415         _zz_setpos(fd, (int64_t)FPOS_CAST(*pos)); \
     427        _zz_setpos(fd, FPOS_T_TO_INT64_T(*pos)); \
    416428        debug_stream("after", stream); \
    417429        debug("%s([%i], %lli) = %i", __func__, \
    418               fd, (long long int)FPOS_CAST(*pos), ret); \
     430              fd, (long long int)FPOS_T_TO_INT64_T(*pos), ret); \
    419431    } \
    420432    while(0)
     
    483495#if defined HAVE_FSETPOS64
    484496#undef fsetpos64
    485 int NEW(fsetpos64)(FILE *stream, const fpos64_t *pos)
     497int NEW(fsetpos64)(FILE *stream, const FPOS64_T *pos)
    486498{
    487499    int ret; ZZ_FSETPOS(fsetpos64); return ret;
     
    491503#if defined HAVE___FSETPOS64
    492504#undef __fsetpos64
    493 int NEW(__fsetpos64)(FILE *stream, const fpos64_t *pos)
     505int NEW(__fsetpos64)(FILE *stream, const FPOS64_T *pos)
    494506{
    495507    int ret; ZZ_FSETPOS(__fsetpos64); return ret;
Note: See TracChangeset for help on using the changeset viewer.