VC++ has QUADKIND == QUAD_IS___INT64 so we might as well make use of it

- Use I64/UI64 suffixes rather than I64TYPE/U64TYPE casts for
  INT64_C/UINT64_C, not just when _WIN64 is defined
- Use UI64 suffix rather than UL for U64_CONST

2 files changed, 8 insertions, 6 deletions

diff --git a/handy.h b/handy.h
index db018d74cc..d4df8bdaee 100644
--- a/handy.h
+++ b/handy.h
@@ -191,13 +191,13 @@ typedef U64TYPE U64;
 #       define PeRl_INT64_C(c)	CAT2(c,LL)
 #       define PeRl_UINT64_C(c)	CAT2(c,ULL)
 #   else
-#       if LONGSIZE == 8 && QUADKIND == QUAD_IS_LONG
-#           define PeRl_INT64_C(c)	CAT2(c,L)
-#           define PeRl_UINT64_C(c)	CAT2(c,UL)
+#       if QUADKIND == QUAD_IS___INT64
+#           define PeRl_INT64_C(c)	CAT2(c,I64)
+#           define PeRl_UINT64_C(c)	CAT2(c,UI64)
 #       else
-#           if defined(_WIN64) && defined(_MSC_VER)
-#               define PeRl_INT64_C(c)	CAT2(c,I64)
-#               define PeRl_UINT64_C(c)	CAT2(c,UI64)
+#           if LONGSIZE == 8 && QUADKIND == QUAD_IS_LONG
+#               define PeRl_INT64_C(c)	CAT2(c,L)
+#               define PeRl_UINT64_C(c)	CAT2(c,UL)
 #           else
 #               define PeRl_INT64_C(c)	((I64TYPE)(c))
 #               define PeRl_UINT64_C(c)	((U64TYPE)(c))
diff --git a/perl.h b/perl.h
index af4e9bfa83..bc78844028 100644
--- a/perl.h
+++ b/perl.h
@@ -729,6 +729,8 @@ EXTERN_C int usleep(unsigned int);
 #   define U64_CONST(x) ((U64)x##UL)
 #  elif QUADKIND == QUAD_IS_LONG_LONG
 #   define U64_CONST(x) ((U64)x##ULL)
+#  elif QUADKIND == QUAD_IS___INT64
+#   define U64_CONST(x) ((U64)x##UI64)
 #  else /* best guess we can make */
 #   define U64_CONST(x) ((U64)x##UL)
 #  endif