Skip to content

Commit

Permalink
tools_common.h: (msvs) avoid redefining off_t
Browse files Browse the repository at this point in the history
in some configurations MSVS will define _off_t / off_t in wchar.h; the
former is used locally while the latter is for compatibility. this
change overrides off_t as in the past and sets _OFF_T_DEFINED to prevent
a clash in types.

Change-Id: I9b0e6db586a0a2729b545d93edfc56570d2fcf97
  • Loading branch information
jzern committed Apr 3, 2014
1 parent 5c185a0 commit dae4cfc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
#endif

#if defined(_MSC_VER)
/* MSVS doesn't define off_t, and uses _f{seek,tell}i64. */
typedef __int64 off_t;
/* MSVS uses _f{seek,tell}i64. */
#define fseeko _fseeki64
#define ftello _ftelli64
typedef long _off_t; // NOLINT - MSVS compatible type
typedef __int64 off_t; // fseeki64 compatible type
#define _OFF_T_DEFINED
#elif defined(_WIN32)
/* MinGW defines off_t as long and uses f{seek,tell}o64/off64_t for large
* files. */
Expand Down

0 comments on commit dae4cfc

Please sign in to comment.