https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffd3b0c8db153f16abccd5...
commit ffd3b0c8db153f16abccd53ab0daf96ed197bf70 Author: Thomas Faber thomas.faber@reactos.org AuthorDate: Mon Feb 5 18:21:23 2018 +0100 Commit: Thomas Faber thomas.faber@reactos.org CommitDate: Mon Feb 5 18:21:48 2018 +0100
[LIBTIFF] Restore ROS-diff that I thought was no longer needed because of PCH. CORE-14291 --- sdk/include/reactos/libs/libtiff/tif_config.h | 8 ++++++++ sdk/include/reactos/libs/libtiff/tiffconf.h | 8 ++++++++ 2 files changed, 16 insertions(+)
diff --git a/sdk/include/reactos/libs/libtiff/tif_config.h b/sdk/include/reactos/libs/libtiff/tif_config.h index 449d5a746e..0621c7ae56 100644 --- a/sdk/include/reactos/libs/libtiff/tif_config.h +++ b/sdk/include/reactos/libs/libtiff/tif_config.h @@ -42,13 +42,21 @@ #define TIFF_INT64_FORMAT "%I64d"
/* Signed 64-bit type */ +#ifdef __GNUC__ +#define TIFF_INT64_T signed long long +#else #define TIFF_INT64_T signed __int64 +#endif
/* Unsigned 64-bit type formatter */ #define TIFF_UINT64_FORMAT "%I64u"
/* Unsigned 64-bit type */ +#ifdef __GNUC__ +#define TIFF_UINT64_T unsigned long long +#else #define TIFF_UINT64_T unsigned __int64 +#endif
#if _WIN64 /* diff --git a/sdk/include/reactos/libs/libtiff/tiffconf.h b/sdk/include/reactos/libs/libtiff/tiffconf.h index c5d566f8d3..799a47a545 100644 --- a/sdk/include/reactos/libs/libtiff/tiffconf.h +++ b/sdk/include/reactos/libs/libtiff/tiffconf.h @@ -47,13 +47,21 @@ #define TIFF_INT64_FORMAT "%I64d"
/* Signed 64-bit type */ +#ifdef __GNUC__ +#define TIFF_INT64_T signed long long +#else #define TIFF_INT64_T signed __int64 +#endif
/* Unsigned 64-bit type formatter */ #define TIFF_UINT64_FORMAT "%I64u"
/* Unsigned 64-bit type */ +#ifdef __GNUC__ +#define TIFF_UINT64_T unsigned long long +#else #define TIFF_UINT64_T unsigned __int64 +#endif
#if _WIN64 /*