diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-04-23 08:01:36 -0600 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-05-06 11:50:46 -0600 |
| commit | a83c95e9f46ef695a55fc7a6911e11846da9903c (patch) | |
| tree | 42abde5f3b34b239bb95e84200ea16ad4a4c562d /libhw_generic | |
| parent | b3ee525e9e0d49485714770d898cf9c28769313a (diff) | |
Merge libobj into libmisc
Diffstat (limited to 'libhw_generic')
| -rw-r--r-- | libhw_generic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libhw_generic/include/libhw/generic/alarmclock.h | 2 | ||||
| -rw-r--r-- | libhw_generic/include/libhw/generic/io.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libhw_generic/CMakeLists.txt b/libhw_generic/CMakeLists.txt index 603f30b..602168b 100644 --- a/libhw_generic/CMakeLists.txt +++ b/libhw_generic/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(libhw_generic INTERFACE) target_include_directories(libhw_generic PUBLIC INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_link_libraries(libhw_generic INTERFACE libmisc - libobj ) target_sources(libhw_generic INTERFACE 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 ********************************************************************/ |