Thu Dec 5 03:21:42 2019 UTC ()
Avoid redefining uint_t &c. if compat_defs.h already defines them.


(riastradh)
diff -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/opentypes.h
cvs diff -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/opentypes.h (switch to unified diff)

--- src/external/cddl/osnet/sys/sys/opentypes.h 2018/09/06 00:44:43 1.4
+++ src/external/cddl/osnet/sys/sys/opentypes.h 2019/12/05 03:21:42 1.5
@@ -1,88 +1,90 @@ @@ -1,88 +1,90 @@
1#ifndef _OPENSOLARIS_SYS_OPENTYPES_H_ 1#ifndef _OPENSOLARIS_SYS_OPENTYPES_H_
2#define _OPENSOLARIS_SYS_OPENTYPES_H_ 2#define _OPENSOLARIS_SYS_OPENTYPES_H_
3 3
4#define MAXNAMELEN 256 4#define MAXNAMELEN 256
5#define FMNAMESZ 8 5#define FMNAMESZ 8
6 6
7#if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H) 7#if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H)
8#ifndef __defined_ll_t 8#ifndef __defined_ll_t
9#define __defined_ll_t 9#define __defined_ll_t
10typedef long long longlong_t; 10typedef long long longlong_t;
11typedef unsigned long long u_longlong_t; 11typedef unsigned long long u_longlong_t;
12#endif 12#endif
13typedef unsigned long vsize_t; 13typedef unsigned long vsize_t;
14#endif 14#endif
15 15
16typedef unsigned int size32_t; 16typedef unsigned int size32_t;
17typedef unsigned int caddr32_t; 17typedef unsigned int caddr32_t;
18 18
19typedef struct timespec timestruc_t; 19typedef struct timespec timestruc_t;
20#ifndef __defined_ts_t 20#ifndef __defined_ts_t
21#define __defined_ts_t 21#define __defined_ts_t
22typedef struct timespec timespec_t; 22typedef struct timespec timespec_t;
23#endif 23#endif
 24#ifndef HAVE_NBTOOL_CONFIG_H
24typedef unsigned int uint_t; 25typedef unsigned int uint_t;
25typedef unsigned char uchar_t; 26typedef unsigned char uchar_t;
26typedef unsigned short ushort_t; 27typedef unsigned short ushort_t;
27typedef unsigned long ulong_t; 28typedef unsigned long ulong_t;
 29#endif
28typedef off_t off64_t; 30typedef off_t off64_t;
29typedef id_t taskid_t; 31typedef id_t taskid_t;
30typedef id_t projid_t; 32typedef id_t projid_t;
31typedef id_t poolid_t; 33typedef id_t poolid_t;
32typedef id_t zoneid_t; 34typedef id_t zoneid_t;
33typedef id_t ctid_t; 35typedef id_t ctid_t;
34 36
35#define B_FALSE 0 37#define B_FALSE 0
36#define B_TRUE 1 38#define B_TRUE 1
37typedef int boolean_t; 39typedef int boolean_t;
38 40
39#ifndef __defined_hr_t 41#ifndef __defined_hr_t
40#define __defined_hr_t 42#define __defined_hr_t
41typedef longlong_t hrtime_t; 43typedef longlong_t hrtime_t;
42#endif 44#endif
43typedef int32_t t_scalar_t; 45typedef int32_t t_scalar_t;
44typedef uint32_t t_uscalar_t; 46typedef uint32_t t_uscalar_t;
45#if defined(_KERNEL) || defined(_KERNTYPES) 47#if defined(_KERNEL) || defined(_KERNTYPES)
46typedef vsize_t pgcnt_t; 48typedef vsize_t pgcnt_t;
47#endif 49#endif
48typedef u_longlong_t len_t; 50typedef u_longlong_t len_t;
49typedef int major_t; 51typedef int major_t;
50typedef int minor_t; 52typedef int minor_t;
51typedef int o_uid_t; 53typedef int o_uid_t;
52typedef int o_gid_t; 54typedef int o_gid_t;
53typedef struct kauth_cred cred_t; 55typedef struct kauth_cred cred_t;
54typedef uintptr_t pc_t; 56typedef uintptr_t pc_t;
55typedef struct vm_page page_t; 57typedef struct vm_page page_t;
56typedef ushort_t o_mode_t; /* old file attribute type */ 58typedef ushort_t o_mode_t; /* old file attribute type */
57typedef u_longlong_t diskaddr_t; 59typedef u_longlong_t diskaddr_t;
58typedef void *zone_t; 60typedef void *zone_t;
59typedef struct vfsops vfsops_t; 61typedef struct vfsops vfsops_t;
60 62
61#ifdef _KERNEL 63#ifdef _KERNEL
62 64
63typedef short index_t; 65typedef short index_t;
64typedef off_t offset_t; 66typedef off_t offset_t;
65typedef int64_t rlim64_t; 67typedef int64_t rlim64_t;
66typedef __caddr_t caddr_t; /* core address */ 68typedef __caddr_t caddr_t; /* core address */
67 69
68#else 70#else
69 71
70typedef longlong_t offset_t; 72typedef longlong_t offset_t;
71typedef u_longlong_t u_offset_t; 73typedef u_longlong_t u_offset_t;
72typedef uint64_t upad64_t; 74typedef uint64_t upad64_t;
73#ifndef __defined_ts_t 75#ifndef __defined_ts_t
74#define __defined_ts_t 76#define __defined_ts_t
75typedef struct timespec timespec_t; 77typedef struct timespec timespec_t;
76#endif 78#endif
77typedef int32_t daddr32_t; 79typedef int32_t daddr32_t;
78typedef int32_t time32_t; 80typedef int32_t time32_t;
79 81
80#endif /* !_KERNEL */ 82#endif /* !_KERNEL */
81 83
82#define MAXOFFSET_T 0x7fffffffffffffffLL 84#define MAXOFFSET_T 0x7fffffffffffffffLL
83#define seg_rw uio_rw 85#define seg_rw uio_rw
84#define S_READ UIO_READ 86#define S_READ UIO_READ
85#define S_WRITE UIO_WRITE 87#define S_WRITE UIO_WRITE
86struct aio_req; 88struct aio_req;
87 89
88#endif /* _OPENSOLARIS_SYS_OPENTYPES_H_ */ 90#endif /* _OPENSOLARIS_SYS_OPENTYPES_H_ */