BSD 4_4 release

[unix-history] / usr / src / usr.sbin / sendmail / src / useful.h

diff --git a/usr/src/usr.sbin/sendmail/src/useful.h b/usr/src/usr.sbin/sendmail/src/useful.h
index 26c50da..944eb5c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/useful.h
+++ b/usr/src/usr.sbin/sendmail/src/useful.h
@@ -1,10 +1,36 @@
 /*
 /*

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

  *
  *

- * %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.

  *
  *

- *     @(#)useful.h    4.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.
+ *
+ *     @(#)useful.h    8.1 (Berkeley) 6/7/93

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


@@ -25,7 +51,7 @@ typedef char  bool;
 # ifndef max
 # define max(a, b)     ((a) > (b) ? (a) : (b))
 # define min(a, b)     ((a) < (b) ? (a) : (b))
 # ifndef max
 # define max(a, b)     ((a) > (b) ? (a) : (b))
 # define min(a, b)     ((a) < (b) ? (a) : (b))

-# endif max
+# endif

 
 /* assertions */
 # ifndef NASSERT
 
 /* assertions */
 # ifndef NASSERT


@@ -42,6 +68,6 @@ typedef char  bool;
 /* sccs id's */
 # ifndef lint
 # define SCCSID(arg)   static char SccsId[] = "arg";
 /* sccs id's */
 # ifndef lint
 # define SCCSID(arg)   static char SccsId[] = "arg";

-# else /* lint */
+# else

 # define SCCSID(arg)
 # define SCCSID(arg)

-# endif lint
+# endif