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 (expand / 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
@@ -11,30 +11,32 @@ typedef long long longlong_t; @@ -11,30 +11,32 @@ typedef 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