21 files changed, 62 insertions, 170 deletions
diff --git a/Configure b/Configure
index ba95818774..24b62efb7e 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Fri Feb 11 21:50:12 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Sat Feb 12 03:16:21 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -877,7 +877,6 @@ archname64=''
 use64bits=''
 uselargefiles=''
 uselongdouble=''
-uselonglong=''
 usemorebits=''
 usemultiplicity=''
 nm_opt=''
@@ -950,7 +949,7 @@ loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
 loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
 
 : general looking path for locating libraries
-glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large"
+glibpth="/shlib /usr/shlib /lib/pa20_64 /lib/pa1.1 /usr/lib/large"
 glibpth="$glibpth /lib /usr/lib $xlibpth"
 glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
 glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
@@ -3715,9 +3714,6 @@ for thislib in $libswanted; do
 		libstyle="static"
 	fi
 	if $test -f "$xxx"; then
-		eval $libscheck
-	fi
-	if $test -f "$xxx"; then
 		case "$libstyle" in
 		shared) echo "Found -l$libname (shared)." ;;
 		static) echo "Found -l$libname." ;;
@@ -4374,25 +4370,33 @@ case "$intsize:$longsize" in
 
 You have natively 64-bit integers.
 EOM
-   val="$define" ;;
-*) cat <<EOM
+   val="$define"
+   ;;
+*) case "$ccflags" in
+   *-DUSE_64_BITS*|*-DUSE_LONG_LONG*) use64bits="$define";;
+   *) case "$uselonglong" in
+      $define|true|[yY]*) use64bits="$define";;
+      esac
+      ;;
+   esac
+   case "$use64bits" in
+   $define|true|[yY]*) dflt='y';;
+   *) dflt='n';;
+   esac
+cat <<EOM
 
 Perl can be built to take advantage of 64-bit integer types
 on some systems.  To do so, Configure must be run with -Duse64bits.
 
-If this doesn't make any sense to you, just accept the default.
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-  case "$use64bits" in
-  $define|true|[yY]*)	dflt='y';;
-  *) dflt='n';;
-  esac
-  rp='Try to use 64-bit integers, if available?'
-  . ./myread
-  case "$ans" in
-  y|Y) val="$define" ;;
-  *)   val="$undef"  ;;
-  esac
-  ;;
+   rp='Try to use 64-bit integers, if available?'
+   . ./myread
+   case "$ans" in
+   [yY]*) val="$define" ;;
+   *)     val="$undef"  ;;
+   esac
+   ;;
 esac
 set use64bits
 eval $setvar
@@ -7044,49 +7048,6 @@ EOM
 	;;
 esac
 
-case "$uselonglong" in
-''|true|[yY]*) uselonglong="$define" ;;
-*) case "$ccflags" in
-   *-DUSE_LONG_LONG*) uselonglong="$define" ;;
-   *) uselonglong="$undef" ;;
-   esac
-   ;;
-esac
-case "$uselonglong" in
-$define)	dflt='y';;
-*)		dflt='n';;
-esac
-cat <<EOM
-
-Perl can be built to take advantage of long longs which
-(if available) may give more range for integer numbers.
-
-If this doesn't make any sense to you, just accept the default '$dflt'.
-EOM
-rp='Try to use long longs if available?'
-. ./myread
-case "$ans" in
-y|Y) 	val="$define"	;;
-*)      val="$undef"	;;
-esac
-set uselonglong
-eval $setvar
-case "$uselonglong" in
-$define)
-: Look for a hint-file generated 'call-back-unit'.  If the
-: user has specified that long longs should be used,
-: we may need to set or change some other defaults.
-	if $test -f uselonglong.cbu; then
-		echo "Your platform has some specific hints for long longs, using them..."
-		. ./uselonglong.cbu
-	else
-		$cat <<EOM
-(Your platform doesn't have any specific hints for long longs.)
-EOM
-	fi
-	;;
-esac
-
 cat <<EOM
 
 Previous version of $package used the standard IO mechanisms as defined
@@ -9656,11 +9617,7 @@ case "$intsize" in
 esac
 
 case "$quadtype" in
-'')	case "$uselonglong:$d_longlong:$longlongsize" in
-	undef:define:8)
-	   echo "(You would have 'long long', but you are not using it.)" >&4 ;;
-	*) echo "Alas, no 64-bit integer types in sight." >&4 ;;
-	esac
+'')	echo "Alas, no 64-bit integer types in sight." >&4
 	d_quad="$undef"
 	;;
 *)	if test X"$use64bits" = Xdefine -o X"$longsize" = X8; then
@@ -15208,7 +15165,6 @@ usedl='$usedl'
 useithreads='$useithreads'
 uselargefiles='$uselargefiles'
 uselongdouble='$uselongdouble'
-uselonglong='$uselonglong'
 usemorebits='$usemorebits'
 usemultiplicity='$usemultiplicity'
 usemymalloc='$usemymalloc'
diff --git a/Porting/Glossary b/Porting/Glossary
index 25676c20a6..44012c4bf1 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -3341,10 +3341,6 @@ uselongdouble (uselongdbl.U):
 	This variable conditionally defines the USE_LONG_DOUBLE symbol,
 	and indicates that long doubles should be used when available.
 
-uselonglong (uselonglong.U):
-	This variable conditionally defines the USE_LONG_LONG symbol,
-	and indicates that long longs should be used when available.
-
 usemorebits (usemorebits.U):
 	This variable conditionally defines the USE_MORE_BITS symbol,
 	and indicates that explicit 64-bit interfaces and long doubles
diff --git a/Porting/config.sh b/Porting/config.sh
index b6544148f9..f21eb39f7a 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed Feb  9 21:48:10 EET 2000
+# Configuration time: Sat Feb 12 01:09:19 EET 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -59,7 +59,7 @@ ccflags='-pthread -std -DLANGUAGE_C'
 ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_BSD=1 SYSTYPE_BSD=1 unix=1'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Wed Feb  9 21:48:10 EET 2000'
+cf_time='Sat Feb 12 01:09:19 EET 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -726,7 +726,6 @@ usedl='define'
 useithreads='define'
 uselargefiles='define'
 uselongdouble='undef'
-uselonglong='define'
 usemorebits='undef'
 usemultiplicity='define'
 usemymalloc='n'
diff --git a/Porting/config_H b/Porting/config_H
index e999cb9206..4c41d24ed7 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Wed Feb  9 21:48:10 EET 2000
+ * Configuration time: Sat Feb 12 01:09:19 EET 2000
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -2843,14 +2843,6 @@
 /*#define	USE_LONG_DOUBLE		/ **/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-#define	USE_LONG_LONG		/**/
-#endif
-
 /* USE_MORE_BITS:
  *	This symbol, if defined, indicates that 64-bit interfaces and
  *	long doubles should be used when available.
diff --git a/config_h.SH b/config_h.SH
index 6795efd393..b7c39f06e7 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2857,14 +2857,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$uselongdouble	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-#$uselonglong	USE_LONG_LONG		/**/
-#endif
-
 /* USE_MORE_BITS:
  *	This symbol, if defined, indicates that 64-bit interfaces and
  *	long doubles should be used when available.
diff --git a/epoc/config.sh b/epoc/config.sh
index 55ca6bd51c..533bdccdc9 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -758,7 +758,7 @@ d_ustat='undef'
 i_sysstatfs='undef'
 i_sysvfs='undef'
 i_ustat='undef'
-uselonglong='define'
+use64bits='define'
 uidsize='2'
 gidsize='2'
 
diff --git a/hints/aix.sh b/hints/aix.sh
index fec963b8f8..c7020c8d66 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -230,8 +230,8 @@ EOM
 		;;
 	    esac
 	    case "$ccflags" in
-	    *-DUSE_LONG_LONG*) ;;
-	    *) ccflags="$ccflags -DUSE_LONG_LONG" ;;
+	    *-DUSE_64_BITS*) ;;
+	    *) ccflags="$ccflags -DUSE_64_BITS" ;;
 	    esac
 	    # When a 64-bit cc becomes available $archname64
 	    # may need setting so that $archname gets it attached.
diff --git a/hints/hpux.sh b/hints/hpux.sh
index 048a416c5a..426ff59a62 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -296,22 +296,28 @@ case "$use64bits" in
 $define|true|[yY]*)
 	if [ "$xxOsRevMajor" -lt 11 ]; then
 		cat <<EOM >&4
+
 64-bit compilation is not supported on HP-UX $xxOsRevMajor.
 You need at least HP-UX 11.0.
 Cannot continue, aborting.
+
 EOM
 		exit 1
 	fi
+
+	# Without the 64-bit libc we cannot do much.
 	if [ ! -f /lib/pa20_64/libc.sl ]; 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.
+
 EOM
 		exit 1
 	fi
-
         ccflags="$ccflags +DD64"
+        ldflags="$ldflags +DD64"
 	ld=/usr/bin/ld
 	ar=/usr/bin/ar
 	loclibpth="/lib/pa20_64 $loclibpth"
@@ -322,12 +328,6 @@ EOM
 	set `echo " $libswanted " | sed -e 's@ dl @ @'`
 	libswanted="$*"
 
-	libscheck='
-case "`/usr/bin/file $xxx`" in
-*LP64*) ;;
-*) xxx=/non/64/bit$xxx ;;
-esac
-'
 	;;
 esac
 EOCBU
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index f4bbf32d01..67e61b4607 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -246,8 +246,8 @@ EOM
 	    case "$cc $ccflags" in
 	    *-n32*)
 		case "$ccflags" in
-		*-DUSE_LONG_LONG) ;;
-		*) ccflags="$ccflags -DUSE_LONG_LONG" ;;
+		*-DUSE_64_BITS*) ;;
+		*) ccflags="$ccflags -DUSE_64_BITS" ;;
 		esac
 		archname64="-n32"
 		;;
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 8c280e3fb7..e27d026aa7 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -343,10 +343,14 @@ $define|true|[yY]*)
 	lflibs="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
 	case "$lfcflags$lfldflags$lflibs" in
 	'');;
-	*) uselonglong="$define"
-           echo "(Large files in Solaris require also long longs, using long longs...)"
-	   ccflags="$ccflags -DUSE_LONG_LONG $lfcflags"
-	   ldflags="$ldflags $ldldflags"
+	*) use64bits="$define"
+           echo "(Large files in Solaris require also using long longs...)"
+	   case "$ccflags" in
+	   *-DUSE_64_BITS*) ;;
+	   *) ccflags="$ccflags -DUSE_64_BITS" ;;
+	   esac
+	   ccflags="$ccflags $lfcflags"
+	   ldflags="$ldflags $lfldflags"
 	   libswanted="$libswanted $lflibs"
 	   ;;
 	esac
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
diff --git a/vms/subconfigure.com b/vms/subconfigure.com
index f2852abcea..150a00b0c0 100644
--- a/vms/subconfigure.com
+++ b/vms/subconfigure.com
@@ -3687,7 +3687,6 @@ $ WC "d_oldpthreads='" + perl_d_oldpthreads + "'"
 $ WC "d_longdbl='" + perl_d_longdbl + "'"
 $ WC "longdblsize='" + perl_longdblsize + "'"
 $ WC "d_longlong='" + perl_d_longlong + "'"
-$ WC "uselonglong='" + perl_d_longlong + "'"
 $ WC "longlongsize='" + perl_longlongsize + "'"
 $ WC "d_mkstemp='" + perl_d_mkstemp + "'"
 $ WC "d_mkstemps='" + perl_d_mkstemps + "'"
@@ -3947,7 +3946,7 @@ $    WRITE CONFIG "#undef ALWAYS_DEFTYPES"
 $ ENDIF
 $ if use_64bit.eqs."Y"
 $ THEN
-$    WRITE CONFIG "#define USE_LONG_LONG"
+$    WRITE CONFIG "#define USE_64_BITS"
 $    WRITE CONFIG "#define USE_LONG_DOUBLE"
 $ ENDIF
 $ WRITE CONFIG "#define HAS_ENVGETENV"
diff --git a/vos/config.def b/vos/config.def
index 23b0fcc518..19ec5ed338 100644
--- a/vos/config.def
+++ b/vos/config.def
@@ -431,7 +431,6 @@ $use64bits='undef'
 $usedl='undef'
 $uselargefiles='undef'
 $uselongdouble='define'
-$uselonglong='undef'
 $usemorebits='undef'
 $usemultiplicity='undef'
 $useperlio='undef'
diff --git a/vos/config.h b/vos/config.h
index c1fdd06dec..51a7d2e404 100644
--- a/vos/config.h
+++ b/vos/config.h
@@ -2553,14 +2553,6 @@
 #define	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-/*#define	USE_LONG_LONG		/**/
-#endif
-
 #ifndef USE_MORE_BITS
 /*#define	USE_MORE_BITS		/**/
 #endif
diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index 56df72c16a..07c6a079b3 100755
--- a/vos/config_h.SH_orig
+++ b/vos/config_h.SH_orig
@@ -2571,14 +2571,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$uselongdouble	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-#$uselonglong	USE_LONG_LONG		/**/
-#endif
-
 #ifndef USE_MORE_BITS
 #$usemorebits	USE_MORE_BITS		/**/
 #endif
diff --git a/win32/config.bc b/win32/config.bc
index 70054d67fd..9c44eb0ab7 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -708,7 +708,6 @@ usedl='define'
 useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
-uselonglong='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
diff --git a/win32/config.gc b/win32/config.gc
index 9b613d939e..d4dde746e0 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -708,7 +708,6 @@ usedl='define'
 useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
-uselonglong='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
diff --git a/win32/config.vc b/win32/config.vc
index fa5ab64b7e..ff50f5195f 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -708,7 +708,6 @@ usedl='define'
 useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
-uselonglong='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 7ce21cbd9d..698131cac2 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -2771,14 +2771,6 @@
 /*#define	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-/*#define	USE_LONG_LONG		/**/
-#endif
-
 #ifndef USE_MORE_BITS
 /*#define	USE_MORE_BITS		/**/
 #endif
diff --git a/win32/config_H.gc b/win32/config_H.gc
index f7b3ff96b6..bd5def2ee8 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -2771,14 +2771,6 @@
 /*#define	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-/*#define	USE_LONG_LONG		/**/
-#endif
-
 #ifndef USE_MORE_BITS
 /*#define	USE_MORE_BITS		/**/
 #endif
diff --git a/win32/config_H.vc b/win32/config_H.vc
index c4d9c4292f..2543f1d07c 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -2771,14 +2771,6 @@
 /*#define	USE_LONG_DOUBLE		/**/
 #endif
 
-/* USE_LONG_LONG:
- *	This symbol, if defined, indicates that long longs should
- *	be used when available.
- */
-#ifndef USE_LONG_LONG
-/*#define	USE_LONG_LONG		/**/
-#endif
-
 #ifndef USE_MORE_BITS
 /*#define	USE_MORE_BITS		/**/
 #endif