HP-UX 64-bitness cures

p4raw-id: //depot/cfgperl@5511

diff --git a/hints/hpux.sh b/hints/hpux.sh
index bbb91f7..9a0d362 100644 (file)
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -140,6 +140,9 @@ else
 fi
 
 # Do this right now instead of the delayed callback unit approach.
+case "$use64bitall" in
+$define|true|[yY]*) use64bitint="$define" ;;
+esac
 case "$use64bitint" in
 $define|true|[yY]*)
     if [ "$xxOsRevMajor" -lt 11 ]; then
@@ -154,12 +157,13 @@ EOM
     fi
 
     # Without the 64-bit libc we cannot do much.
-    if [ ! -f /lib/pa20_64/libc.sl ]; then
+    libc='/lib/pa20_64/libc.sl'
+    if [ ! -f "$libc" ]; then
                cat <<EOM >&4
 
-You do not seem to have the 64-bit libraries in /lib/pa20_64.
-Most importantly, I cannot find /lib/pa20_64/libc.sl.
-Cannot continue, aborting.
+*** You do not seem to have the 64-bit libraries in /lib/pa20_64.
+*** Most importantly, I cannot find the $libc.
+*** Cannot continue, aborting.
 
 EOM
                exit 1

diff --git a/perl.h b/perl.h
index aeaaa45..d9dcbba 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -3076,6 +3076,9 @@ typedef struct am_table_short AMTS;
 #endif /* !USE_LOCALE_NUMERIC */
 
 #if !defined(Atol) && defined(IV_IS_QUAD) && QUADKIND == QUAD_IS_LONG_LONG
+#    ifdef __hpux
+#        define strtoll __strtoll      /* secret handshake */
+#    endif
 #   if !defined(Atol) && defined(HAS_STRTOLL)
 #       define Atol(s) strtoll(s, (char**)NULL, 10)
 #   endif
@@ -3089,6 +3092,9 @@ typedef struct am_table_short AMTS;
 #endif
 
 #if !defined(Strtoul) && defined(UV_IS_QUAD) && QUADKIND == QUAD_IS_LONG_LONG
+#    ifdef __hpux
+#        define strtoull __strtoull    /* secret handshake */
+#    endif
 #    if !defined(Strtoul) && defined(HAS_STRTOULL)
 #       define Strtoul strtoull
 #    endif