Merge "tools_common.h: (msvs) avoid redefining off_t"

This commit is contained in:
James Zern
2014-04-03 12:00:27 -07:00
committed by Gerrit Code Review

View File

@@ -22,10 +22,12 @@
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
/* MSVS doesn't define off_t, and uses _f{seek,tell}i64. */ /* MSVS uses _f{seek,tell}i64. */
typedef __int64 off_t;
#define fseeko _fseeki64 #define fseeko _fseeki64
#define ftello _ftelli64 #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) #elif defined(_WIN32)
/* MinGW defines off_t as long and uses f{seek,tell}o64/off64_t for large /* MinGW defines off_t as long and uses f{seek,tell}o64/off64_t for large
* files. */ * files. */