move to machtypes.h; include label_t

SCCS-vsn: sys/vax/include/types.h 7.2
SCCS-vsn: sys/hp300/include/types.h 7.2
SCCS-vsn: sys/i386/include/types.h 7.2

diff --git a/usr/src/sys/hp300/include/types.h b/usr/src/sys/hp300/include/types.h
index b33c4d9..066ab09 100644 (file)
--- a/usr/src/sys/hp300/include/types.h
+++ b/usr/src/sys/hp300/include/types.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.1 (Berkeley) %G%
+ *     @(#)types.h     7.2 (Berkeley) %G%

  */
 
  */
 

-#ifndef        _X3J11_H_
-#define        _X3J11_H_
+#ifndef        _MACHTYPES_H_
+#define        _MACHTYPES_H_

 
 /*
  * Types which are fundamental to the implementation and may appear in
 
 /*
  * Types which are fundamental to the implementation and may appear in


@@ -26,4 +26,11 @@
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 

-#endif /* _X3J11_H_ */
+#ifndef _ANSI_SOURCE
+typedef        struct  _physadr { short r[1]; } *physadr;
+typedef        struct  label_t {
+       int     val[15];        /* consistent with HP-UX */
+} label_t;
+#endif
+
+#endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/i386/include/types.h b/usr/src/sys/i386/include/types.h
index b33c4d9..bd57e89 100644 (file)
--- a/usr/src/sys/i386/include/types.h
+++ b/usr/src/sys/i386/include/types.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.1 (Berkeley) %G%
+ *     @(#)types.h     7.2 (Berkeley) %G%

  */
 
  */
 

-#ifndef        _X3J11_H_
-#define        _X3J11_H_
+#ifndef        _MACHTYPES_H_
+#define        _MACHTYPES_H_

 
 /*
  * Types which are fundamental to the implementation and may appear in
 
 /*
  * Types which are fundamental to the implementation and may appear in


@@ -26,4 +26,11 @@
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 

-#endif /* _X3J11_H_ */
+#ifndef _ANSI_SOURCE
+typedef        struct  _physadr { int r[1]; } *physadr;
+typedef        struct  label_t {
+       int     val[6];
+} label_t;
+#endif
+
+#endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/vax/include/types.h b/usr/src/sys/vax/include/types.h
index b33c4d9..19cfc88 100644 (file)
--- a/usr/src/sys/vax/include/types.h
+++ b/usr/src/sys/vax/include/types.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.1 (Berkeley) %G%
+ *     @(#)types.h     7.2 (Berkeley) %G%

  */
 
  */
 

-#ifndef        _X3J11_H_
-#define        _X3J11_H_
+#ifndef        _MACHTYPES_H_
+#define        _MACHTYPES_H_

 
 /*
  * Types which are fundamental to the implementation and may appear in
 
 /*
  * Types which are fundamental to the implementation and may appear in


@@ -26,4 +26,10 @@
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 
 #define        _WCHAR_T_       unsigned short          /* wchar_t */
 #define        _SIZE_T_        unsigned int            /* sizeof() */
 

-#endif /* _X3J11_H_ */
+#ifndef _ANSI_SOURCE
+typedef        struct  _physadr { int r[1]; } *physadr;
+typedef        struct  label_t {
+       int     val[14];
+} label_t;
+#endif
+#endif /* _MACHTYPES_H_ */