BSD 4_4 release

[unix-history] / usr / src / sys / netccitt / pk_timer.c

diff --git a/usr/src/sys/netccitt/pk_timer.c b/usr/src/sys/netccitt/pk_timer.c
index 2ebff61..52c1860 100644 (file)
--- a/usr/src/sys/netccitt/pk_timer.c
+++ b/usr/src/sys/netccitt/pk_timer.c
@@ -2,17 +2,43 @@
  * Copyright (c) Computing Centre, University of British Columbia, 1984
  * Copyright (C) Computer Science Department IV, 
  *              University of Erlangen-Nuremberg, Germany, 1990, 1992
  * Copyright (c) Computing Centre, University of British Columbia, 1984
  * Copyright (C) Computer Science Department IV, 
  *              University of Erlangen-Nuremberg, Germany, 1990, 1992

- * Copyright (c) 1990, 1992   Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  * 
  * This code is derived from software contributed to Berkeley by the
  * Laboratory for Computation Vision and the Computer Science Department
  * of the the University of British Columbia and the Computer Science
  * Department (IV) of the University of Erlangen-Nuremberg, Germany.
  *
  * 
  * This code is derived from software contributed to Berkeley by the
  * Laboratory for Computation Vision and the Computer Science Department
  * of the the University of British Columbia and the Computer Science
  * Department (IV) of the University of Erlangen-Nuremberg, Germany.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.

  *
  *

- *     @(#)pk_timer.c  7.7 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)pk_timer.c  8.1 (Berkeley) 6/10/93

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>