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

--- 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

@@ -21,10 +21,12 @@
 #define __defined_ts_t
 typedef	struct timespec	timespec_t;
 #endif
+#ifndef HAVE_NBTOOL_CONFIG_H
 typedef unsigned int	uint_t;
 typedef unsigned char	uchar_t;
 typedef unsigned short	ushort_t;
 typedef unsigned long	ulong_t;
+#endif
 typedef off_t		off64_t;
 typedef id_t		taskid_t;
 typedef id_t		projid_t;