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 /lib9p | |
| parent | b3ee525e9e0d49485714770d898cf9c28769313a (diff) | |
Merge libobj into libmisc
Diffstat (limited to 'lib9p')
| -rw-r--r-- | lib9p/core_gen/c.py | 4 | ||||
| -rw-r--r-- | lib9p/core_generated.c | 2 | ||||
| -rw-r--r-- | lib9p/srv_include/lib9p/srv.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib9p/core_gen/c.py b/lib9p/core_gen/c.py index c05e457..393766b 100644 --- a/lib9p/core_gen/c.py +++ b/lib9p/core_gen/c.py @@ -35,9 +35,9 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str: #include "core_tables.h" #include "core_utf8.h" """ - # libobj vtables ########################################################### + # libmisc/obj.h vtables #################################################### ret += """ -/* libobj vtables *************************************************************/ +/* libmisc/obj.h vtables ******************************************************/ """ for typ in typs: ret += cutil.ifdef_push(1, c9util.ver_ifdef(typ.in_versions)) diff --git a/lib9p/core_generated.c b/lib9p/core_generated.c index 3c2ee28..2532d12 100644 --- a/lib9p/core_generated.c +++ b/lib9p/core_generated.c @@ -12,7 +12,7 @@ #include "core_tables.h" #include "core_utf8.h" -/* libobj vtables *************************************************************/ +/* libmisc/obj.h vtables ******************************************************/ #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_uninitialized LO_IMPLEMENTATION_C(fmt_formatter, lib9p_tag_t, lib9p_tag, static); LO_IMPLEMENTATION_C(fmt_formatter, lib9p_fid_t, lib9p_fid, static); diff --git a/lib9p/srv_include/lib9p/srv.h b/lib9p/srv_include/lib9p/srv.h index ca80e7b..c40c85a 100644 --- a/lib9p/srv_include/lib9p/srv.h +++ b/lib9p/srv_include/lib9p/srv.h @@ -12,8 +12,8 @@ #include <libcr_ipc/rpc.h> #include <libhw/generic/net.h> #include <libmisc/assert.h> +#include <libmisc/obj.h> #include <libmisc/private.h> -#include <libobj/obj.h> #include <lib9p/core.h> |