From 8acd4c3ff48720f31c54a696df3257c26f2ef555 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Sun, 28 Dec 2014 12:44:24 +0300 Subject: [PATCH] More accurate fix for libtiff and aarch64. --- modules/highgui/src/grfmt_tiff.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/grfmt_tiff.cpp b/modules/highgui/src/grfmt_tiff.cpp index 9b05b364ec..eb64aa4068 100644 --- a/modules/highgui/src/grfmt_tiff.cpp +++ b/modules/highgui/src/grfmt_tiff.cpp @@ -50,8 +50,9 @@ #include "precomp.hpp" #include "grfmt_tiff.hpp" -#define int64 int64_tiff -#define uint64 uint64_tiff +#if !defined _MSC_VER && !defined __BORLANDC__ +# include +#endif #ifdef HAVE_TIFF # include "tiff.h"