Changed types.h that the common struct definitions are also available

outside of the kernel. They are needed in conf.h. Added an include of
cdefs.h in disklabel.h for the non-kernel case for the definition of __P.

diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index a25fb53..cda7941 100644 (file)
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)disklabel.h   7.19 (Berkeley) 5/7/91
  * SUCH DAMAGE.
  *
  *     from: @(#)disklabel.h   7.19 (Berkeley) 5/7/91

- *     $Id: disklabel.h,v 1.3 1993/11/07 17:52:27 wollman Exp $
+ *     $Id: disklabel.h,v 1.4 1993/11/25 01:37:56 wollman Exp $

  */
 
 #ifndef _SYS_DISKLABEL_H_
 #define _SYS_DISKLABEL_H_ 1
 
 #ifndef KERNEL
  */
 
 #ifndef _SYS_DISKLABEL_H_
 #define _SYS_DISKLABEL_H_ 1
 
 #ifndef KERNEL

+#include <sys/cdefs.h>

 #include <sys/conf.h>
 #else
 #include "conf.h"
 #include <sys/conf.h>
 #else
 #include "conf.h"

diff --git a/sys/sys/types.h b/sys/sys/types.h
index ac2e068..679952d 100644 (file)
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)types.h       7.17 (Berkeley) 5/6/91
  * SUCH DAMAGE.
  *
  *     from: @(#)types.h       7.17 (Berkeley) 5/6/91

- *     $Id$
+ *     $Id: types.h,v 1.2 1993/10/16 17:18:12 rgrimes Exp $

  */
 
 #ifndef _TYPES_H_
  */
 
 #ifndef _TYPES_H_


@@ -116,7 +116,7 @@ typedef     struct fd_set {
 #define        FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 #define        FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
 
 #define        FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 #define        FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
 

-#if defined(__STDC__) && defined(KERNEL)
+#if defined(__STDC__)

 /*
  * Forward structure declarations for function prototypes.
  * We include the common structures that cross subsystem boundaries here;
 /*
  * Forward structure declarations for function prototypes.
  * We include the common structures that cross subsystem boundaries here;