From 39d8fd2161d0a505c5b25add023aad833714b980 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Tue, 22 Apr 2025 15:06:50 -0600
Subject: Use C23

This gives us:
 - [[maybe_unused]] instead of [[gnu::unused]]
 - bool/true/false are predefined, so no need for <stdbool.h>
---
 libhw_generic/include/libhw/generic/alarmclock.h | 1 -
 libhw_generic/include/libhw/generic/net.h        | 1 -
 2 files changed, 2 deletions(-)

(limited to 'libhw_generic/include/libhw/generic')

diff --git a/libhw_generic/include/libhw/generic/alarmclock.h b/libhw_generic/include/libhw/generic/alarmclock.h
index 02789f5..39050c9 100644
--- a/libhw_generic/include/libhw/generic/alarmclock.h
+++ b/libhw_generic/include/libhw/generic/alarmclock.h
@@ -7,7 +7,6 @@
 #ifndef _LIBHW_GENERIC_ALARMCLOCK_H_
 #define _LIBHW_GENERIC_ALARMCLOCK_H_
 
-#include <stdbool.h> /* for bool */
 #include <stdint.h>  /* for uint{n}_t and UINT{n}_C */
 
 #include <libmisc/private.h>
diff --git a/libhw_generic/include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h
index 4af574b..1052392 100644
--- a/libhw_generic/include/libhw/generic/net.h
+++ b/libhw_generic/include/libhw/generic/net.h
@@ -8,7 +8,6 @@
 #define _LIBHW_GENERIC_NET_H_
 
 #include <inttypes.h>  /* for PRI{u,x}{n} */
-#include <stdbool.h>   /* for bool */
 #include <stddef.h>    /* for size_t */
 #include <stdint.h>    /* for uint{n}_t} */
 #include <sys/types.h> /* for ssize_t */
-- 
cgit v1.2.3-2-g168b


From a83c95e9f46ef695a55fc7a6911e11846da9903c Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Wed, 23 Apr 2025 08:01:36 -0600
Subject: Merge libobj into libmisc

---
 libhw_generic/include/libhw/generic/alarmclock.h | 2 +-
 libhw_generic/include/libhw/generic/io.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libhw_generic/include/libhw/generic')

diff --git a/libhw_generic/include/libhw/generic/alarmclock.h b/libhw_generic/include/libhw/generic/alarmclock.h
index 39050c9..6ce2513 100644
--- a/libhw_generic/include/libhw/generic/alarmclock.h
+++ b/libhw_generic/include/libhw/generic/alarmclock.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>  /* for uint{n}_t and UINT{n}_C */
 
+#include <libmisc/obj.h>
 #include <libmisc/private.h>
-#include <libobj/obj.h>
 
 /* Useful constants ***********************************************************/
 
diff --git a/libhw_generic/include/libhw/generic/io.h b/libhw_generic/include/libhw/generic/io.h
index 62ddbb3..6adce8c 100644
--- a/libhw_generic/include/libhw/generic/io.h
+++ b/libhw_generic/include/libhw/generic/io.h
@@ -11,7 +11,7 @@
 #include <stdint.h>    /* for uintptr_t */
 #include <sys/types.h> /* for ssize_t */
 
-#include <libobj/obj.h>
+#include <libmisc/obj.h>
 
 /* structs ********************************************************************/
 
-- 
cgit v1.2.3-2-g168b