Module Name: src
Committed By: kre
Date: Fri Jun 1 00:56:19 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: opentypes.h time.h types.h
Log Message:
Avoid duplicate typedefs so these headers can be used
as part of tools build, when the base system compiler does
not allow duplicate type definitions.
Someone please fix this some better way than this!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/sys/opentypes.h
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/sys/sys/time.h
cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/sys/sys/types.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.2 src/external/cddl/osnet/sys/sys/opentypes.h:1.3
--- src/external/cddl/osnet/sys/sys/opentypes.h:1.2 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/opentypes.h Fri Jun 1 00:56:19 2018
@@ -5,8 +5,11 @@
#define FMNAMESZ 8
#if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H)
+#ifndef __defined_ll_t
+#define __defined_ll_t
typedef long long longlong_t;
typedef unsigned long long u_longlong_t;
+#endif
typedef unsigned long vsize_t;
#endif
@@ -14,7 +17,10 @@ typedef unsigned int size32_t;
typedef unsigned int caddr32_t;
typedef struct timespec timestruc_t;
+#ifndef __defined_ts_t
+#define __defined_ts_t
typedef struct timespec timespec_t;
+#endif
typedef unsigned int uint_t;
typedef unsigned char uchar_t;
typedef unsigned short ushort_t;
@@ -30,7 +36,10 @@ typedef id_t ctid_t;
#define B_TRUE 1
typedef int boolean_t;
+#ifndef __defined_hr_t
+#define __defined_hr_t
typedef longlong_t hrtime_t;
+#endif
typedef int32_t t_scalar_t;
typedef uint32_t t_uscalar_t;
#if defined(_KERNEL) || defined(_KERNTYPES)
@@ -61,7 +70,10 @@ typedef __caddr_t caddr_t; /* core addre
typedef longlong_t offset_t;
typedef u_longlong_t u_offset_t;
typedef uint64_t upad64_t;
+#ifndef __defined_ts_t
+#define __defined_ts_t
typedef struct timespec timespec_t;
+#endif
typedef int32_t daddr32_t;
typedef int32_t time32_t;
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.9 src/external/cddl/osnet/sys/sys/time.h:1.10
--- src/external/cddl/osnet/sys/sys/time.h:1.9 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/time.h Fri Jun 1 00:56:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.9 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: time.h,v 1.10 2018/06/01 00:56:19 kre Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <[email protected]>
@@ -45,7 +45,10 @@
#define NSEC2SEC(n) ((n) / (NANOSEC / SEC))
#define SEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / SEC))
+#ifndef __defined_hr_t
+#define __defined_hr_t
typedef longlong_t hrtime_t;
+#endif
#if defined(__i386__) || defined(__powerpc__)
#define TIMESPEC_OVERFLOW(ts) \
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.18 src/external/cddl/osnet/sys/sys/types.h:1.19
--- src/external/cddl/osnet/sys/sys/types.h:1.18 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/types.h Fri Jun 1 00:56:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.18 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: types.h,v 1.19 2018/06/01 00:56:19 kre Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -83,8 +83,11 @@
#endif
#undef longlong_t
#undef u_longlong_t
+#ifndef __defined_ll_t
+#define __defined_ll_t
typedef long long longlong_t;
typedef unsigned long long u_longlong_t;
+#endif
#ifndef _KERNEL
#include <stdarg.h>
