BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / named / ns.h

diff --git a/usr/src/usr.sbin/named/ns.h b/usr/src/usr.sbin/named/ns.h
index 0f7581a..1d0f264 100644 (file)
--- a/usr/src/usr.sbin/named/ns.h
+++ b/usr/src/usr.sbin/named/ns.h
@@ -2,21 +2,35 @@
  * Copyright (c) 1985, 1990 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1990 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  *
  *

- *     @(#)ns.h        4.31 (Berkeley) 6/1/90
+ * 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.
+ *
+ *     @(#)ns.h        4.33 (Berkeley) 8/23/90

  */
 
 /*
  */
 
 /*


@@ -226,10 +240,23 @@ extern struct stats stats[S_NSTATS];
 extern unsigned long typestats[T_ANY+1];
 #endif
 
 extern unsigned long typestats[T_ANY+1];
 #endif
 

-#ifndef VOID
-/* Support posix signals and old systems equally */
-#define VOID void
+/*
+ * Attempt to configure for type of function returned by signal-catching
+ * functions (which signal and sigvec.sv_handler take a pointer to).
+ * This can guess for BSD; otherwise, define SIG_FN externally.
+ */
+#ifndef        SIG_FN
+#ifdef BSD
+#if BSD >= 199006
+#define SIG_FN void            /* signal-catching functions return void */
+#else
+#define SIG_FN int             /* signal-catching functions return int */

 #endif
 #endif

+#else  /* BSD */
+#define SIG_FN void            /* signal-catching functions return void */
+#endif /* BSD */
+#endif
+

 
 #ifdef DEBUG
 extern int debug;                      /* debug flag */
 
 #ifdef DEBUG
 extern int debug;                      /* debug flag */