integral types: one more time, with feeling

SCCS-vsn: sys/hp300/include/types.h 7.13
SCCS-vsn: sys/i386/include/types.h 7.9
SCCS-vsn: sys/hp300/include/types.h 7.13
SCCS-vsn: sys/pmax/include/types.h 7.5
SCCS-vsn: sys/sparc/include/types.h 7.7
SCCS-vsn: sys/vax/include/types.h 7.9

diff --git a/usr/src/sys/hp300/include/types.h b/usr/src/sys/hp300/include/types.h
index 1aa7908..57775a4 100644 (file)
--- a/usr/src/sys/hp300/include/types.h
+++ b/usr/src/sys/hp300/include/types.h
@@ -4,12 +4,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.12 (Berkeley) %G%
+ *     @(#)types.h     7.13 (Berkeley) %G%

  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 
  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        short r[1];
 } *physadr;
 typedef struct _physadr {
        short r[1];
 } *physadr;


@@ -17,6 +18,7 @@ typedef struct _physadr {
 typedef struct label_t {                       /* Consistent with HP-UX. */
        int val[15];
 } label_t;
 typedef struct label_t {                       /* Consistent with HP-UX. */
        int val[15];
 } label_t;

+#endif

 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;
 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;


@@ -25,13 +27,13 @@ typedef     u_long  vm_size_t;
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */

-typedef        signed char                int8;
-typedef        unsigned char            u_int8;
-typedef        short                     int16;
-typedef        unsigned short          u_int16;
-typedef        int                       int32;
-typedef        unsigned int            u_int32;
-typedef        long long                 int64;
-typedef        unsigned long long      u_int64;
+typedef        signed char                int8_t;
+typedef        unsigned char            u_int8_t;
+typedef        short                     int16_t;
+typedef        unsigned short          u_int16_t;
+typedef        int                       int32_t;
+typedef        unsigned int            u_int32_t;
+typedef        long long                 int64_t;
+typedef        unsigned long long      u_int64_t;

 
 #endif /* _MACHTYPES_H_ */
 
 #endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/i386/include/types.h b/usr/src/sys/i386/include/types.h
index 2a2dd19..bc19786 100644 (file)
--- a/usr/src/sys/i386/include/types.h
+++ b/usr/src/sys/i386/include/types.h
@@ -4,12 +4,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.8 (Berkeley) %G%
+ *     @(#)types.h     7.9 (Berkeley) %G%

  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 
  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        int r[1];
 } *physadr;
 typedef struct _physadr {
        int r[1];
 } *physadr;


@@ -17,6 +18,7 @@ typedef struct _physadr {
 typedef struct label_t {
        int val[6];
 } label_t;
 typedef struct label_t {
        int val[6];
 } label_t;

+#endif

 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;
 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;


@@ -25,13 +27,13 @@ typedef     u_long  vm_size_t;
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */

-typedef        signed char                int8;
-typedef        unsigned char            u_int8;
-typedef        short                     int16;
-typedef        unsigned short          u_int16;
-typedef        int                       int32;
-typedef        unsigned int            u_int32;
-typedef        long long                 int64;
-typedef        unsigned long long      u_int64;
+typedef        signed char                int8_t;
+typedef        unsigned char            u_int8_t;
+typedef        short                     int16_t;
+typedef        unsigned short          u_int16_t;
+typedef        int                       int32_t;
+typedef        unsigned int            u_int32_t;
+typedef        long long                 int64_t;
+typedef        unsigned long long      u_int64_t;

 
 #endif /* _MACHTYPES_H_ */
 
 #endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/pmax/include/types.h b/usr/src/sys/pmax/include/types.h
index 3a9bceb..bca326a 100644 (file)
--- a/usr/src/sys/pmax/include/types.h
+++ b/usr/src/sys/pmax/include/types.h
@@ -7,12 +7,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.4 (Berkeley) %G%
+ *     @(#)types.h     7.5 (Berkeley) %G%

  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 
  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        int r[1];
 } *physadr;
 typedef struct _physadr {
        int r[1];
 } *physadr;


@@ -20,6 +21,7 @@ typedef struct _physadr {
 typedef struct label_t {
        int val[12];
 } label_t;
 typedef struct label_t {
        int val[12];
 } label_t;

+#endif

 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;
 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;


@@ -28,13 +30,13 @@ typedef     u_long  vm_size_t;
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */

-typedef        signed char                int8;
-typedef        unsigned char            u_int8;
-typedef        short                     int16;
-typedef        unsigned short          u_int16;
-typedef        int                       int32;
-typedef        unsigned int            u_int32;
-typedef        long long                 int64;
-typedef        unsigned long long      u_int64;
+typedef        signed char                int8_t;
+typedef        unsigned char            u_int8_t;
+typedef        short                     int16_t;
+typedef        unsigned short          u_int16_t;
+typedef        int                       int32_t;
+typedef        unsigned int            u_int32_t;
+typedef        long long                 int64_t;
+typedef        unsigned long long      u_int64_t;

 
 #endif /* _MACHTYPES_H_ */
 
 #endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/sparc/include/types.h b/usr/src/sys/sparc/include/types.h
index 13f4ace..3d28c22 100644 (file)
--- a/usr/src/sys/sparc/include/types.h
+++ b/usr/src/sys/sparc/include/types.h
@@ -13,7 +13,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.6 (Berkeley) %G%
+ *     @(#)types.h     7.7 (Berkeley) %G%

  *
  * from: $Header: types.h,v 1.5 92/11/26 02:00:07 torek Exp $ (LBL)
  */
  *
  * from: $Header: types.h,v 1.5 92/11/26 02:00:07 torek Exp $ (LBL)
  */


@@ -21,6 +21,7 @@
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        short r[1];
 } *physadr;
 typedef struct _physadr {
        short r[1];
 } *physadr;


@@ -28,6 +29,7 @@ typedef struct _physadr {
 typedef struct label_t {
        int val[2];
 } label_t;
 typedef struct label_t {
        int val[2];
 } label_t;

+#endif

 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;
 
 typedef        u_long  vm_offset_t;
 typedef        u_long  vm_size_t;


@@ -36,13 +38,13 @@ typedef     u_long  vm_size_t;
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */

-typedef        signed char                int8;
-typedef        unsigned char            u_int8;
-typedef        short                     int16;
-typedef        unsigned short          u_int16;
-typedef        int                       int32;
-typedef        unsigned int            u_int32;
-typedef        long long                 int64;
-typedef        unsigned long long      u_int64;
+typedef        signed char                int8_t;
+typedef        unsigned char            u_int8_t;
+typedef        short                     int16_t;
+typedef        unsigned short          u_int16_t;
+typedef        int                       int32_t;
+typedef        unsigned int            u_int32_t;
+typedef        long long                 int64_t;
+typedef        unsigned long long      u_int64_t;

 
 #endif /* _MACHTYPES_H_ */
 
 #endif /* _MACHTYPES_H_ */

diff --git a/usr/src/sys/vax/include/types.h b/usr/src/sys/vax/include/types.h
index 95a36af..722725b 100644 (file)
--- a/usr/src/sys/vax/include/types.h
+++ b/usr/src/sys/vax/include/types.h
@@ -4,12 +4,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)types.h     7.8 (Berkeley) %G%
+ *     @(#)types.h     7.9 (Berkeley) %G%

  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 
  */
 
 #ifndef        _MACHTYPES_H_
 #define        _MACHTYPES_H_
 

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        int r[1];
 } *physadr;
 typedef struct _physadr {
        int r[1];
 } *physadr;


@@ -17,18 +18,19 @@ typedef struct _physadr {
 typedef struct label_t {
        int val[14];
 } label_t;
 typedef struct label_t {
        int val[14];
 } label_t;

+#endif

 
 /*
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
 
 /*
  * Basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */

-typedef        signed char                int8;
-typedef        unsigned char            u_int8;
-typedef        short                     int16;
-typedef        unsigned short          u_int16;
-typedef        int                       int32;
-typedef        unsigned int            u_int32;
-typedef        long long                 int64;
-typedef        unsigned long long      u_int64;
+typedef        signed char                int8_t;
+typedef        unsigned char            u_int8_t;
+typedef        short                     int16_t;
+typedef        unsigned short          u_int16_t;
+typedef        int                       int32_t;
+typedef        unsigned int            u_int32_t;
+typedef        long long                 int64_t;
+typedef        unsigned long long      u_int64_t;

 
 #endif /* _MACHTYPES_H_ */
 
 #endif /* _MACHTYPES_H_ */