summaryrefslogtreecommitdiff
path: root/pp_ctl.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-08-31 23:20:04 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-08-31 23:20:04 +0000
commit1cec8c4eda97bdbeee95b406719cad8abf472ea2 (patch)
tree64bfe06b58d3ed9cff131d3b02de8c6231f14f5f /pp_ctl.c
parentd7bd2736634b49c2bce24e023017746e5f315e5d (diff)
downloadperl-1cec8c4eda97bdbeee95b406719cad8abf472ea2.tar.gz
Small tweaks all over.
p4raw-id: //depot/perl@6961
Diffstat (limited to 'pp_ctl.c')
-rw-r--r--pp_ctl.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index 80adc493bc..ac09d42422 100644
--- 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