BSD 4_3_Reno release

[unix-history] / usr / src / sys / sys / socketvar.h

diff --git a/usr/src/sys/sys/socketvar.h b/usr/src/sys/sys/socketvar.h
index aea6363..caa81e2 100644 (file)
--- a/usr/src/sys/sys/socketvar.h
+++ b/usr/src/sys/sys/socketvar.h
@@ -2,9 +2,22 @@
  * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, 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.

  *
  *

- *     @(#)socketvar.h 7.12 (Berkeley) %G%
+ *     @(#)socketvar.h 7.11 (Berkeley) 6/30/90

  */
 
 /*
  */
 
 /*


@@ -139,7 +152,7 @@ struct socket {
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb) ((sb)->sb_flags & SB_LOCK ? sb_lock(sb) : \
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb) ((sb)->sb_flags & SB_LOCK ? sb_lock(sb) : \

-               ((sb)->sb_flags |= SB_LOCK, 0))
+               ((sb)->sb_flags |= SB_LOCK), 0)

 
 /* release lock on sockbuf sb */
 #define        sbunlock(sb) { \
 
 /* release lock on sockbuf sb */
 #define        sbunlock(sb) { \