Module Name: src
Committed By: riastradh
Date: Thu Dec 5 03:21:42 UTC 2019
Modified Files:
src/external/cddl/osnet/sys/sys: opentypes.h
Log Message:
Avoid redefining uint_t &c. if compat_defs.h already defines them.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/opentypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/opentypes.h
diff -u src/external/cddl/osnet/sys/sys/opentypes.h:1.4 src/external/cddl/osnet/sys/sys/opentypes.h:1.5
--- src/external/cddl/osnet/sys/sys/opentypes.h:1.4 Thu Sep 6 00:44:43 2018
+++ src/external/cddl/osnet/sys/sys/opentypes.h Thu Dec 5 03:21:42 2019
@@ -21,10 +21,12 @@ typedef struct timespec timestruc_t;
#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;
