BSD 4_3_Net_2 release

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

diff --git a/usr/src/sys/sys/cdefs.h b/usr/src/sys/sys/cdefs.h
index abd67ee..fbe572a 100644 (file)
--- a/usr/src/sys/sys/cdefs.h
+++ b/usr/src/sys/sys/cdefs.h
@@ -1,10 +1,36 @@
 /*
 /*

- * Copyright (c) 1988 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.

  * All rights reserved.
  *
  * 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.

  *
  *

- *     @(#)cdefs.h     7.5 (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.
+ *
+ *     @(#)cdefs.h     7.6 (Berkeley) 5/4/91

  */
 
 #ifndef        _CDEFS_H_
  */
 
 #ifndef        _CDEFS_H_


@@ -19,29 +45,34 @@
 #endif
 
 /*
 #endif
 
 /*

- * The __CONCAT macro is a bit tricky -- make sure you don't put
- * spaces in between its arguments, also you can't use strings in
- * code that's intended for historical compilers.
+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
+ * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
+ * in between its arguments.  __CONCAT can also concatenate double-quoted
+ * strings produced by the __STRING macro, but this only works with ANSI C.

  */
 #if defined(__STDC__) || defined(__cplusplus)
 #define        __P(protos)     protos          /* full-blown ANSI C */
 #define        __CONCAT(x,y)   x ## y
 #define        __STRING(x)     #x
  */
 #if defined(__STDC__) || defined(__cplusplus)
 #define        __P(protos)     protos          /* full-blown ANSI C */
 #define        __CONCAT(x,y)   x ## y
 #define        __STRING(x)     #x

-#else                                  /* traditional style */
+
+#else  /* !(__STDC__ || __cplusplus) */
+#define        __P(protos)     ()              /* traditional C preprocessor */
+#define        __CONCAT(x,y)   x/**/y
+#define        __STRING(x)     "x"
+

 #ifdef __GNUC__
 #define        const           __const         /* GCC: ANSI C with -traditional */
 #define        inline          __inline
 #define        signed          __signed
 #define        volatile        __volatile
 #ifdef __GNUC__
 #define        const           __const         /* GCC: ANSI C with -traditional */
 #define        inline          __inline
 #define        signed          __signed
 #define        volatile        __volatile

-#else
+
+#else  /* !__GNUC__ */

 #define        const                           /* delete ANSI C keywords */
 #define        inline
 #define        signed
 #define        volatile
 #define        const                           /* delete ANSI C keywords */
 #define        inline
 #define        signed
 #define        volatile

-#endif
-#define        __P(protos)     ()              /* traditional C preprocessor */
-#define        __CONCAT(x,y)   x/**/y
-#define        __STRING(x)     "x"
-#endif
+#endif /* !__GNUC__ */
+#endif /* !(__STDC__ || __cplusplus) */

 
 #endif /* !_CDEFS_H_ */
 
 #endif /* !_CDEFS_H_ */