BSD 4_4 release

[unix-history] / usr / src / sys / hp / hpux / hpux.h

diff --git a/usr/src/sys/hp/hpux/hpux.h b/usr/src/sys/hp/hpux/hpux.h
index b855ea4..62f6a11 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux.h
+++ b/usr/src/sys/hp/hpux/hpux.h
@@ -1,17 +1,43 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

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

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

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

  *
  *

- * from: Utah $Hdr: hpux.h 1.27 92/12/23$
+ * 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.

  *
  *

- *     @(#)hpux.h      7.8 (Berkeley) %G%
+ * from: Utah $Hdr: hpux.h 1.30 93/06/28$
+ *
+ *     @(#)hpux.h      8.1 (Berkeley) 7/8/93

  */
 
 #include <hp/hpux/hpux_exec.h>
  */
 
 #include <hp/hpux/hpux_exec.h>


@@ -138,8 +164,8 @@ struct hpuxuser {
 #define        HPUXFTRUNC      00001000
 #define        HPUXFEXCL       00002000
 #define HPUXFSYNCIO    00100000
 #define        HPUXFTRUNC      00001000
 #define        HPUXFEXCL       00002000
 #define HPUXFSYNCIO    00100000

+#define HPUXNONBLOCK   00200000

 #define HPUXFREMOTE    01000000
 #define HPUXFREMOTE    01000000

-#define FUSECACHE      04000000

 
 /* HP-UX only sysV shmctl() commands */
 #define SHM_LOCK       3       /* Lock segment in core */
 
 /* HP-UX only sysV shmctl() commands */
 #define SHM_LOCK       3       /* Lock segment in core */