Small tweaks all over.

p4raw-id: //depot/perl@6961

diff --git a/AUTHORS b/AUTHORS
index 9e1325a..ba0a2de 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -74,7 +74,7 @@ seibert               Greg Seibert            seibert@Lynx.COM
 simon          Simon Cozens            simon@brecon.co.uk
 spider         Spider Boardman         spider@Orb.Nashua.NH.US
 smccam         Stephen McCamant        smccam@uclink4.berkeley.edu
-sthoneanna     Yitzchak Scott-Thoennes sthoenna@efn.org
+sthoenna       Yitzchak Scott-Thoennes sthoenna@efn.org
 sugalskd       Dan Sugalski            dan@sidhe.org
 sundstrom      David Sundstrom         sunds@asictest.sc.ti.com
 tchrist                Tom Christiansen        tchrist@perl.com

diff --git a/Configure b/Configure
index 428241e..d63e46e 100755 (executable)
--- 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 Thu Aug 31 21:06:17 EET DST 2000 [metaconfig 3.0 PL70]
+# Generated on Fri Sep  1 02:17:50 EET DST 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >/tmp/c1$$ <<EOF
@@ -7856,12 +7856,13 @@ EOP
 case "$d_Gconvert" in
 gconvert*) xxx_list='gconvert gcvt sprintf' ;;
 gcvt*) xxx_list='gcvt gconvert sprintf' ;;
+sprintf*) xxx_list='sprintf gconvert gcvt' ;;
 *) xxx_list='gconvert gcvt sprintf' ;;
 esac
 
 case "$d_longdbl$uselongdouble$d_PRIgldbl" in
 "$define$define$define")
-    # for long doubles prefer sprintf
+    # for long doubles prefer first qgcvt, then sprintf
     xxx_list="`echo $xxx_list|sed s/sprintf//`" 
     xxx_list="sprintf $xxx_list"
     case "$d_qgcvt" in

diff --git a/pp_ctl.c b/pp_ctl.c
index 80adc49..ac09d42 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3691,14 +3691,20 @@ typedef SV * gptr;              /* pointers in our lists */
  * The original author of the mergesort implementation included here
  * is Peter M. McIlroy <pmcilroy@lucent.com> (see: Optimistic Merge Sort
  * (SODA '92)), and the integrator of it to the Perl source code is
- * John Linderman <jpl@research.att.com>.
+ * John P. Linderman <jpl@research.att.com>.
  *
  * Both Peter and John agree with the inclusion of their code in here
  * and with their code being distributed under the same terms as Perl.
  *
- * This code originally developed in conjunction with the BSD Computer
- * Software Research Group and the University of California at Berkeley.
+ * Much of this code is original source code from BSD4.4, and is
+ * copyright (c) 1991 The Regents of the University of California.
  *
+ * 1. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 2. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.         
  */
 
 /* Binary merge internal sort, with a few special mods