BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / vax / include / types.h

diff --git a/usr/src/sys/vax/include/types.h b/usr/src/sys/vax/include/types.h
index ebd7189..b698245 100644 (file)
--- a/usr/src/sys/vax/include/types.h
+++ b/usr/src/sys/vax/include/types.h
@@ -2,36 +2,61 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * 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.

  *
  *

- *     @(#)types.h     7.3 (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.
+ *
+ *     @(#)types.h     7.10 (Berkeley) 1/5/94

  */
 
 #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 {
+       int r[1];
+} *physadr;

 
 

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

 } label_t;
 #endif
 } label_t;
 #endif

+
+/*
+ * Basic integral types.  Omit the typedef if
+ * not possible for a machine/compiler combination.
+ */
+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_ */