[src/netbsd-9]: src/external/cddl/osnet/sys/sys Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c7e6b6ea121
branches:  netbsd-9
changeset: 843693:1c7e6b6ea121
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 17 12:52:23 2019 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #564):

        external/cddl/osnet/sys/sys/opentypes.h: revision 1.5

Avoid redefining uint_t &c. if compat_defs.h already defines them.

diffstat:

 external/cddl/osnet/sys/sys/opentypes.h |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r 28a277e0f998 -r 1c7e6b6ea121 external/cddl/osnet/sys/sys/opentypes.h
--- a/external/cddl/osnet/sys/sys/opentypes.h   Tue Dec 17 12:45:30 2019 +0000
+++ b/external/cddl/osnet/sys/sys/opentypes.h   Tue Dec 17 12:52:23 2019 +0000
@@ -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;