Remove clause 3 and 4 from TNF licenses

[bsdgames-darwin.git] / trek / getcodi.c

diff --git a/trek/getcodi.c b/trek/getcodi.c
index c10031c3c0311186e4c2d8c858194cb3962560ae..f6af1db49d0850a738d63a3bd12bc4d47718af17 100644 (file)
--- a/trek/getcodi.c
+++ b/trek/getcodi.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $  */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -31,11 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)getcodi.c  5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)getcodi.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $");
+#endif
 #endif /* not lint */
 
-# include      "getpar.h"
+#include "getpar.h"
+#include "trek.h"
 
 /*
 **  get course and distance
@@ -47,6 +51,7 @@ static char sccsid[] = "@(#)getcodi.c 5.4 (Berkeley) 6/1/90";
 **     (meaning to drop the request).
 */
 
+int
 getcodi(co, di)
 int    *co;
 double *di;