create {hp300,i386,tahoe,vax}/include/ansi.h

SCCS-vsn: sys/sys/types.h 7.14
SCCS-vsn: sys/sys/times.h 7.6
SCCS-vsn: include/time.h 5.12
SCCS-vsn: include/string.h 5.10
SCCS-vsn: include/stdio.h 5.15
SCCS-vsn: include/stddef.h 5.4
SCCS-vsn: sys/hp300/include/types.h 7.9

diff --git a/usr/src/include/stddef.h b/usr/src/include/stddef.h
index 281706b..c81f2bc 100644 (file)
--- a/usr/src/include/stddef.h
+++ b/usr/src/include/stddef.h
@@ -4,12 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stddef.h    5.3 (Berkeley) %G%
+ *     @(#)stddef.h    5.4 (Berkeley) %G%

  */
 
 #ifndef _STDDEF_H_
 #define _STDDEF_H_
  */
 
 #ifndef _STDDEF_H_
 #define _STDDEF_H_

-#include <machine/types.h>
+#include <machine/ansi.h>

 
 typedef        _PTRDIFF_T_     ptrdiff_t;
 
 
 typedef        _PTRDIFF_T_     ptrdiff_t;
 

diff --git a/usr/src/include/stdio.h b/usr/src/include/stdio.h
index 1b489d0..0e4ccba 100644 (file)
--- a/usr/src/include/stdio.h
+++ b/usr/src/include/stdio.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdio.h     5.14 (Berkeley) %G%
+ *     @(#)stdio.h     5.15 (Berkeley) %G%

  */
 
 #ifndef        _STDIO_H_
  */
 
 #ifndef        _STDIO_H_


@@ -15,7 +15,7 @@
 
 #include <sys/cdefs.h>
 
 
 #include <sys/cdefs.h>
 

-#include <machine/types.h>
+#include <machine/ansi.h>

 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_

diff --git a/usr/src/include/string.h b/usr/src/include/string.h
index 1ce4037..8e70eb2 100644 (file)
--- a/usr/src/include/string.h
+++ b/usr/src/include/string.h
@@ -4,12 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)string.h    5.9 (Berkeley) %G%
+ *     @(#)string.h    5.10 (Berkeley) %G%

  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_
  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_

-#include <machine/types.h>
+#include <machine/ansi.h>

 
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;

diff --git a/usr/src/include/time.h b/usr/src/include/time.h
index 1d24dae..f41084e 100644 (file)
--- a/usr/src/include/time.h
+++ b/usr/src/include/time.h
@@ -4,13 +4,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)time.h      5.11 (Berkeley) %G%
+ *     @(#)time.h      5.12 (Berkeley) %G%

  */
 
 #ifndef _TIME_H_
 #define        _TIME_H_
 
  */
 
 #ifndef _TIME_H_
 #define        _TIME_H_
 

-#include <machine/types.h>
+#include <machine/ansi.h>

 
 #ifndef        NULL
 #define        NULL    0
 
 #ifndef        NULL
 #define        NULL    0

diff --git a/usr/src/sys/hp300/include/types.h b/usr/src/sys/hp300/include/types.h
index df4af83..2a3abb2 100644 (file)
--- a/usr/src/sys/hp300/include/types.h
+++ b/usr/src/sys/hp300/include/types.h
@@ -4,38 +4,21 @@
  *
  * %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_
 

-/*
- * Types which are fundamental to the implementation and may appear in
- * more than one standard header are defined here.  Standard headers
- * then use:
- *     #ifdef  _SIZE_T_
- *     typedef _SIZE_T_ size_t;
- *     #undef  _SIZE_T_
- *     #endif
- *
- * Thanks, ANSI!
- */
-#define        _CLOCK_T_       unsigned long           /* clock() */
-#define        _PTRDIFF_T_     int                     /* ptr1 - ptr2 */
-#define        _SIZE_T_        unsigned int            /* sizeof() */
-#define        _TIME_T_        long                    /* time() */
-#define        _VA_LIST_       char *                  /* va_list */
-#define        _WCHAR_T_       unsigned short          /* wchar_t */
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 typedef struct _physadr {
        short r[1];
 } *physadr;
 typedef struct _physadr {
        short r[1];
 } *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;

+

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

-#endif
+

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

diff --git a/usr/src/sys/sys/times.h b/usr/src/sys/sys/times.h
index aa4f58d..8fc6cd4 100644 (file)
--- a/usr/src/sys/sys/times.h
+++ b/usr/src/sys/sys/times.h
@@ -4,10 +4,10 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)times.h     7.5 (Berkeley) %G%
+ *     @(#)times.h     7.6 (Berkeley) %G%

  */
 
  */
 

-#include <machine/types.h>
+#include <machine/ansi.h>

 
 #ifdef _CLOCK_T_
 typedef        _CLOCK_T_       clock_t;
 
 #ifdef _CLOCK_T_
 typedef        _CLOCK_T_       clock_t;

diff --git a/usr/src/sys/sys/types.h b/usr/src/sys/sys/types.h
index 4ae9f4f..fa46d30 100644 (file)
--- a/usr/src/sys/sys/types.h
+++ b/usr/src/sys/sys/types.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

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

  */
 
 #ifndef _TYPES_H_
  */
 
 #ifndef _TYPES_H_


@@ -25,23 +25,26 @@ typedef     unsigned int    u_int;
 typedef        unsigned long   u_long;
 typedef        unsigned short  ushort;         /* Sys V compatibility */
 
 typedef        unsigned long   u_long;
 typedef        unsigned short  ushort;         /* Sys V compatibility */
 

+#include <machine/ansi.h>
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

 #include <machine/types.h>
 #include <machine/types.h>

+#endif

 
 #ifdef _CLOCK_T_
 typedef        _CLOCK_T_       clock_t;
 #undef _CLOCK_T_
 #endif
 
 
 #ifdef _CLOCK_T_
 typedef        _CLOCK_T_       clock_t;
 #undef _CLOCK_T_
 #endif
 

-#ifdef _TIME_T_
-typedef        _TIME_T_        time_t;
-#undef _TIME_T_
-#endif
-

 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_
 #endif
 
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_
 #endif
 

+#ifdef _TIME_T_
+typedef        _TIME_T_        time_t;
+#undef _TIME_T_
+#endif
+

 #ifndef _POSIX_SOURCE
 typedef        struct  _uquad { unsigned long val[2]; } u_quad;
 typedef        struct  _quad { long val[2]; } quad;
 #ifndef _POSIX_SOURCE
 typedef        struct  _uquad { unsigned long val[2]; } u_quad;
 typedef        struct  _quad { long val[2]; } quad;