uts: work with recent kernel uapi headers

These headers define dtrace_id_t themselves, but set _DTRACE_ID_T_DEFINED when they do so. Avoid redefining it ourselves in this case. Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
oracle · Oct 6, 2021 · 0449a78 · 0449a78
1 parent 9ffab97
commit 0449a78
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/uts/common/sys/dtrace_types.h b/uts/common/sys/dtrace_types.h
@@ -93,6 +93,8 @@ typedef unsigned long long hrtime_t;
  * This comes from <linux/dtrace_os.h>.
  */
 
+#ifndef _DTRACE_ID_T_DEFINED
 typedef uint32_t dtrace_id_t;
+#endif
 
 #endif