Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/sys/sys Avoid redefining uint_t &c. if c...



details:   https://anonhg.NetBSD.org/src/rev/5c5b7567379c
branches:  trunk
changeset: 967311:5c5b7567379c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Dec 05 03:21:42 2019 +0000

description:
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 6cb8d82024db -r 5c5b7567379c external/cddl/osnet/sys/sys/opentypes.h
--- a/external/cddl/osnet/sys/sys/opentypes.h   Thu Dec 05 03:21:29 2019 +0000
+++ b/external/cddl/osnet/sys/sys/opentypes.h   Thu Dec 05 03:21:42 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;



Home | Main Index | Thread Index | Old Index