Commit ef02d785 authored by David Gobbi's avatar David Gobbi

Allow absence of i64 suffix when __int64 exists.

The dashboard showed a compile failure on icc because the i64 suffix
did not exist, even though cmake had detected __int64. This patch uses
a suffix of either l or ll if __int64 is really 'long' or 'long long'.

Change-Id: I69b90821d25e4937e22bfc9bf63faaeae9472030
parent 129e8abc
......@@ -147,10 +147,22 @@
# define VTK_UNSIGNED_LONG_LONG_MAX VTK_TYPE_CAST(unsigned long long, ~0ull)
#endif
#if defined(VTK_SIZEOF___INT64)
# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ui64 >> 1))
# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ui64 >> 1)
# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ui64)
# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ui64)
# if defined(VTK_TYPE_SAME_LONG_AND___INT64)
# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ul >> 1))
# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ul >> 1)
# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ul)
# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ul)
# elif defined(VTK_TYPE_SAME_LONG_LONG_AND___INT64)
# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ull >> 1))
# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ull >> 1)
# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ull)
# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ull)
# else
# define VTK___INT64_MIN VTK_TYPE_CAST(__int64, ~(~0ui64 >> 1))
# define VTK___INT64_MAX VTK_TYPE_CAST(__int64, ~0ui64 >> 1)
# define VTK_UNSIGNED___INT64_MIN VTK_TYPE_CAST(unsigned __int64, 0ui64)
# define VTK_UNSIGNED___INT64_MAX VTK_TYPE_CAST(unsigned __int64, ~0ui64)
# endif
#endif
/* Define compatibility names for these constants. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment