megalomaniac 64-bit update: most importantly,

uselonglong is eradicated, only backward
compatibility hooks in use64bits remain.

p4raw-id: //depot/cfgperl@5070

1 files changed, 13 insertions, 15 deletions

diff --git a/perl.h b/perl.h
index b770e1b08f..e25580c99d 100644
--- a/perl.h
+++ b/perl.h
@@ -3012,30 +3012,28 @@ typedef struct am_table_short AMTS;
 
 #endif /* !USE_LOCALE_NUMERIC */
 
-#if !defined(Atol) && defined(USE_64_BITS) && defined(HAS_QUAD)
-#    if !defined(Atol) && defined(HAS_LONG_LONG)
-#       if !defined(Atol) && defined(HAS_STRTOLL)
-#           define Atol(s) strtoll(s, (char**)NULL, 10)
-#       endif
-#       if !defined(Atol) && defined(HAS_ATOLL)
-#           define Atol atoll
-#       endif
-#    endif
+#if !defined(Atol) && defined(IV_IS_QUAD) && QUADKIND == QUAD_IS_LONG_LONG
+#   if !defined(Atol) && defined(HAS_STRTOLL)
+#       define Atol(s) strtoll(s, (char**)NULL, 10)
+#   endif
+#   if !defined(Atol) && defined(HAS_ATOLL)
+#       define Atol atoll
+#   endif
 /* is there atoq() anywhere? */
 #endif
 #if !defined(Atol)
 #   define Atol atol /* we assume atol being available anywhere */
 #endif
 
-#if !defined(Strtoul) && defined(USE_64_BITS) && defined(HAS_QUAD)
-#    if !defined(Strtoul) && defined(HAS_LONG_LONG) && defined(HAS_STRTOULL)
+#if !defined(Strtoul) && defined(UV_IS_QUAD) && QUADKIND == QUAD_IS_LONG_LONG
+#    if !defined(Strtoul) && defined(HAS_STRTOULL)
 #       define Strtoul strtoull
 #    endif
+#endif
 /* is there atouq() anywhere? */
-#    if !defined(Strtoul) && defined(USE_64_BITS) && defined(HAS_STRTOUQ)
-#       define Strtoul strtouq
-#    endif
-#nendif
+#if !defined(Strtoul) && defined(HAS_STRTOUQ)
+#   define Strtoul strtouq
+#endif
 #if !defined(Strtoul)
 #   define Strtoul strtoul /* we assume strtoul being available anywhere */
 #endif