From ae8b2cbd6839c20a884131f2123f6ada539b75ea Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 19 Nov 2013 20:51:31 -0500 Subject: [PATCH] fixed bug with cl_long size on Win32 (thanks to Aaron Kunze) --- modules/core/src/ocl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp index b2181df..f706487 100644 --- a/modules/core/src/ocl.cpp +++ b/modules/core/src/ocl.cpp @@ -114,8 +114,13 @@ typedef struct _cl_sampler * cl_sampler; typedef int cl_int; typedef unsigned cl_uint; -typedef long cl_long; -typedef unsigned long cl_ulong; +#if defined (_WIN32) && defined(_MSC_VER) + typedef __int64 cl_long; + typedef unsigned __int64 cl_ulong; +#else + typedef long cl_long; + typedef unsigned long cl_ulong; +#endif typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ typedef cl_ulong cl_bitfield; -- 2.7.4