Guard against accidental long long use.

p4raw-id: //depot/cfgperl@5068

1 files changed, 18 insertions, 14 deletions

diff --git a/perl.h b/perl.h
index 21398459d8..b770e1b08f 100644
--- a/perl.h
+++ b/perl.h
@@ -3012,26 +3012,30 @@ typedef struct am_table_short AMTS;
 
 #endif /* !USE_LOCALE_NUMERIC */
 
-#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(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
 /* is there atoq() anywhere? */
+#endif
 #if !defined(Atol)
 #   define Atol atol /* we assume atol being available anywhere */
 #endif
 
-#if !defined(Strtoul) && defined(HAS_LONG_LONG) && defined(HAS_STRTOULL)
-#   define Strtoul strtoull
-#endif
+#if !defined(Strtoul) && defined(USE_64_BITS) && defined(HAS_QUAD)
+#    if !defined(Strtoul) && defined(HAS_LONG_LONG) && defined(HAS_STRTOULL)
+#       define Strtoul strtoull
+#    endif
 /* is there atouq() anywhere? */
-#if !defined(Strtoul) && defined(USE_64_BITS) && defined(HAS_STRTOUQ)
-#   define Strtoul strtouq
-#endif
+#    if !defined(Strtoul) && defined(USE_64_BITS) && defined(HAS_STRTOUQ)
+#       define Strtoul strtouq
+#    endif
+#nendif
 #if !defined(Strtoul)
 #   define Strtoul strtoul /* we assume strtoul being available anywhere */
 #endif