From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Thu, 31 Aug 2000 19:06:30 +0000 (+0000)
Subject: Clarify the mergesort situation.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6187783ac73eba2b93a3a918268a57c4bb3eb978;p=p5sagit%2Fp5-mst-13.2.git

Clarify the mergesort situation.

p4raw-id: //depot/perl@6955
---

diff --git a/pp_ctl.c b/pp_ctl.c
index 01b8fec..1e94c56 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3684,6 +3684,22 @@ typedef	void SV;
 typedef int  (*SVCOMPARE_t) (pTHXo_ SV*, SV*);
 #endif	/* TESTHARNESS */
 
+/* 
+ * The original author of the mergesort implementation included here
+ * is Peter M. McIlroy <pmcilroy@lucent.com>,  and the integrator of
+ * it to the Perl source code is John Lindermann <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.
+ *
+ * Peter is the original copyright holder, UCB was just granted the
+ * right to redistribute the code and has no rights to the original code.
+ * Inclusion of the BSD copyright is just simple courtesy and no
+ * indication of intellectual property.  Keith Bostic <bostic@bostic.com>
+ * agrees with this interpretation.
+ *
+ * --jhi */
+
 typedef char * aptr;		/* pointer for arithmetic on sizes */
 typedef SV * gptr;		/* pointers in our lists */
 
@@ -3692,6 +3708,12 @@ typedef SV * gptr;		/* pointers in our lists */
 ** bugs are jpl's
 */
 
+/* The below advertising clause is ineffective as of July 22, 1999:
+ *
+ *  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+ *
+ */
+
 /* Much of this code is original source code from BSD4.4, and is 
  * copyright (c) 1991 The Regents of the University of California.
  *