From 83f570a6ddedcb03504d26d1ff5149a9e291bbee Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Wed, 2 Oct 2024 19:46:15 +0300 Subject: [PATCH 1/8] Revert "noun: move versioned sources to noun base level" This reverts commit 274710398b4764c54595dcb373b2ec30043765b4. --- pkg/noun/{ => v1}/allocate_v1.c | 0 pkg/noun/{ => v1}/allocate_v1.h | 0 pkg/noun/{ => v1}/hashtable_v1.c | 0 pkg/noun/{ => v1}/hashtable_v1.h | 0 pkg/noun/{ => v1}/jets_v1.c | 0 pkg/noun/{ => v1}/jets_v1.h | 0 pkg/noun/{ => v1}/manage_v1.c | 0 pkg/noun/{ => v1}/manage_v1.h | 0 pkg/noun/{ => v1}/nock_v1.c | 0 pkg/noun/{ => v1}/nock_v1.h | 0 pkg/noun/{ => v1}/vortex_v1.c | 0 pkg/noun/{ => v1}/vortex_v1.h | 0 pkg/noun/{ => v2}/allocate_v2.c | 0 pkg/noun/{ => v2}/allocate_v2.h | 0 pkg/noun/{ => v2}/hashtable_v2.c | 0 pkg/noun/{ => v2}/hashtable_v2.h | 0 pkg/noun/{ => v2}/jets_v2.c | 0 pkg/noun/{ => v2}/jets_v2.h | 0 pkg/noun/{ => v2}/manage_v2.c | 0 pkg/noun/{ => v2}/manage_v2.h | 0 pkg/noun/{ => v2}/nock_v2.c | 0 pkg/noun/{ => v2}/nock_v2.h | 0 pkg/noun/{ => v2}/options_v2.h | 0 pkg/noun/{ => v2}/vortex_v2.c | 0 pkg/noun/{ => v2}/vortex_v2.h | 0 pkg/noun/{ => v3}/allocate_v3.h | 0 pkg/noun/{ => v3}/hashtable_v3.c | 0 pkg/noun/{ => v3}/hashtable_v3.h | 0 pkg/noun/{ => v3}/jets_v3.h | 0 pkg/noun/{ => v3}/manage_v3.c | 0 pkg/noun/{ => v3}/manage_v3.h | 0 pkg/noun/{ => v3}/nock_v3.h | 0 pkg/noun/{ => v3}/vortex_v3.h | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename pkg/noun/{ => v1}/allocate_v1.c (100%) rename pkg/noun/{ => v1}/allocate_v1.h (100%) rename pkg/noun/{ => v1}/hashtable_v1.c (100%) rename pkg/noun/{ => v1}/hashtable_v1.h (100%) rename pkg/noun/{ => v1}/jets_v1.c (100%) rename pkg/noun/{ => v1}/jets_v1.h (100%) rename pkg/noun/{ => v1}/manage_v1.c (100%) rename pkg/noun/{ => v1}/manage_v1.h (100%) rename pkg/noun/{ => v1}/nock_v1.c (100%) rename pkg/noun/{ => v1}/nock_v1.h (100%) rename pkg/noun/{ => v1}/vortex_v1.c (100%) rename pkg/noun/{ => v1}/vortex_v1.h (100%) rename pkg/noun/{ => v2}/allocate_v2.c (100%) rename pkg/noun/{ => v2}/allocate_v2.h (100%) rename pkg/noun/{ => v2}/hashtable_v2.c (100%) rename pkg/noun/{ => v2}/hashtable_v2.h (100%) rename pkg/noun/{ => v2}/jets_v2.c (100%) rename pkg/noun/{ => v2}/jets_v2.h (100%) rename pkg/noun/{ => v2}/manage_v2.c (100%) rename pkg/noun/{ => v2}/manage_v2.h (100%) rename pkg/noun/{ => v2}/nock_v2.c (100%) rename pkg/noun/{ => v2}/nock_v2.h (100%) rename pkg/noun/{ => v2}/options_v2.h (100%) rename pkg/noun/{ => v2}/vortex_v2.c (100%) rename pkg/noun/{ => v2}/vortex_v2.h (100%) rename pkg/noun/{ => v3}/allocate_v3.h (100%) rename pkg/noun/{ => v3}/hashtable_v3.c (100%) rename pkg/noun/{ => v3}/hashtable_v3.h (100%) rename pkg/noun/{ => v3}/jets_v3.h (100%) rename pkg/noun/{ => v3}/manage_v3.c (100%) rename pkg/noun/{ => v3}/manage_v3.h (100%) rename pkg/noun/{ => v3}/nock_v3.h (100%) rename pkg/noun/{ => v3}/vortex_v3.h (100%) diff --git a/pkg/noun/allocate_v1.c b/pkg/noun/v1/allocate_v1.c similarity index 100% rename from pkg/noun/allocate_v1.c rename to pkg/noun/v1/allocate_v1.c diff --git a/pkg/noun/allocate_v1.h b/pkg/noun/v1/allocate_v1.h similarity index 100% rename from pkg/noun/allocate_v1.h rename to pkg/noun/v1/allocate_v1.h diff --git a/pkg/noun/hashtable_v1.c b/pkg/noun/v1/hashtable_v1.c similarity index 100% rename from pkg/noun/hashtable_v1.c rename to pkg/noun/v1/hashtable_v1.c diff --git a/pkg/noun/hashtable_v1.h b/pkg/noun/v1/hashtable_v1.h similarity index 100% rename from pkg/noun/hashtable_v1.h rename to pkg/noun/v1/hashtable_v1.h diff --git a/pkg/noun/jets_v1.c b/pkg/noun/v1/jets_v1.c similarity index 100% rename from pkg/noun/jets_v1.c rename to pkg/noun/v1/jets_v1.c diff --git a/pkg/noun/jets_v1.h b/pkg/noun/v1/jets_v1.h similarity index 100% rename from pkg/noun/jets_v1.h rename to pkg/noun/v1/jets_v1.h diff --git a/pkg/noun/manage_v1.c b/pkg/noun/v1/manage_v1.c similarity index 100% rename from pkg/noun/manage_v1.c rename to pkg/noun/v1/manage_v1.c diff --git a/pkg/noun/manage_v1.h b/pkg/noun/v1/manage_v1.h similarity index 100% rename from pkg/noun/manage_v1.h rename to pkg/noun/v1/manage_v1.h diff --git a/pkg/noun/nock_v1.c b/pkg/noun/v1/nock_v1.c similarity index 100% rename from pkg/noun/nock_v1.c rename to pkg/noun/v1/nock_v1.c diff --git a/pkg/noun/nock_v1.h b/pkg/noun/v1/nock_v1.h similarity index 100% rename from pkg/noun/nock_v1.h rename to pkg/noun/v1/nock_v1.h diff --git a/pkg/noun/vortex_v1.c b/pkg/noun/v1/vortex_v1.c similarity index 100% rename from pkg/noun/vortex_v1.c rename to pkg/noun/v1/vortex_v1.c diff --git a/pkg/noun/vortex_v1.h b/pkg/noun/v1/vortex_v1.h similarity index 100% rename from pkg/noun/vortex_v1.h rename to pkg/noun/v1/vortex_v1.h diff --git a/pkg/noun/allocate_v2.c b/pkg/noun/v2/allocate_v2.c similarity index 100% rename from pkg/noun/allocate_v2.c rename to pkg/noun/v2/allocate_v2.c diff --git a/pkg/noun/allocate_v2.h b/pkg/noun/v2/allocate_v2.h similarity index 100% rename from pkg/noun/allocate_v2.h rename to pkg/noun/v2/allocate_v2.h diff --git a/pkg/noun/hashtable_v2.c b/pkg/noun/v2/hashtable_v2.c similarity index 100% rename from pkg/noun/hashtable_v2.c rename to pkg/noun/v2/hashtable_v2.c diff --git a/pkg/noun/hashtable_v2.h b/pkg/noun/v2/hashtable_v2.h similarity index 100% rename from pkg/noun/hashtable_v2.h rename to pkg/noun/v2/hashtable_v2.h diff --git a/pkg/noun/jets_v2.c b/pkg/noun/v2/jets_v2.c similarity index 100% rename from pkg/noun/jets_v2.c rename to pkg/noun/v2/jets_v2.c diff --git a/pkg/noun/jets_v2.h b/pkg/noun/v2/jets_v2.h similarity index 100% rename from pkg/noun/jets_v2.h rename to pkg/noun/v2/jets_v2.h diff --git a/pkg/noun/manage_v2.c b/pkg/noun/v2/manage_v2.c similarity index 100% rename from pkg/noun/manage_v2.c rename to pkg/noun/v2/manage_v2.c diff --git a/pkg/noun/manage_v2.h b/pkg/noun/v2/manage_v2.h similarity index 100% rename from pkg/noun/manage_v2.h rename to pkg/noun/v2/manage_v2.h diff --git a/pkg/noun/nock_v2.c b/pkg/noun/v2/nock_v2.c similarity index 100% rename from pkg/noun/nock_v2.c rename to pkg/noun/v2/nock_v2.c diff --git a/pkg/noun/nock_v2.h b/pkg/noun/v2/nock_v2.h similarity index 100% rename from pkg/noun/nock_v2.h rename to pkg/noun/v2/nock_v2.h diff --git a/pkg/noun/options_v2.h b/pkg/noun/v2/options_v2.h similarity index 100% rename from pkg/noun/options_v2.h rename to pkg/noun/v2/options_v2.h diff --git a/pkg/noun/vortex_v2.c b/pkg/noun/v2/vortex_v2.c similarity index 100% rename from pkg/noun/vortex_v2.c rename to pkg/noun/v2/vortex_v2.c diff --git a/pkg/noun/vortex_v2.h b/pkg/noun/v2/vortex_v2.h similarity index 100% rename from pkg/noun/vortex_v2.h rename to pkg/noun/v2/vortex_v2.h diff --git a/pkg/noun/allocate_v3.h b/pkg/noun/v3/allocate_v3.h similarity index 100% rename from pkg/noun/allocate_v3.h rename to pkg/noun/v3/allocate_v3.h diff --git a/pkg/noun/hashtable_v3.c b/pkg/noun/v3/hashtable_v3.c similarity index 100% rename from pkg/noun/hashtable_v3.c rename to pkg/noun/v3/hashtable_v3.c diff --git a/pkg/noun/hashtable_v3.h b/pkg/noun/v3/hashtable_v3.h similarity index 100% rename from pkg/noun/hashtable_v3.h rename to pkg/noun/v3/hashtable_v3.h diff --git a/pkg/noun/jets_v3.h b/pkg/noun/v3/jets_v3.h similarity index 100% rename from pkg/noun/jets_v3.h rename to pkg/noun/v3/jets_v3.h diff --git a/pkg/noun/manage_v3.c b/pkg/noun/v3/manage_v3.c similarity index 100% rename from pkg/noun/manage_v3.c rename to pkg/noun/v3/manage_v3.c diff --git a/pkg/noun/manage_v3.h b/pkg/noun/v3/manage_v3.h similarity index 100% rename from pkg/noun/manage_v3.h rename to pkg/noun/v3/manage_v3.h diff --git a/pkg/noun/nock_v3.h b/pkg/noun/v3/nock_v3.h similarity index 100% rename from pkg/noun/nock_v3.h rename to pkg/noun/v3/nock_v3.h diff --git a/pkg/noun/vortex_v3.h b/pkg/noun/v3/vortex_v3.h similarity index 100% rename from pkg/noun/vortex_v3.h rename to pkg/noun/v3/vortex_v3.h From 13b38fce6cb1576789f08c4300afddf836bd1ffe Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Wed, 2 Oct 2024 19:46:27 +0300 Subject: [PATCH 2/8] Revert "zig: rename versioned noun api sources" This reverts commit 45b5568a72fb301371922c1e5bfbf02e943390cd. --- pkg/noun/v1/{allocate_v1.c => allocate.c} | 0 pkg/noun/v1/{allocate_v1.h => allocate.h} | 0 pkg/noun/v1/{hashtable_v1.c => hashtable.c} | 0 pkg/noun/v1/{hashtable_v1.h => hashtable.h} | 0 pkg/noun/v1/{jets_v1.c => jets.c} | 0 pkg/noun/v1/{jets_v1.h => jets.h} | 0 pkg/noun/v1/{manage_v1.c => manage.c} | 0 pkg/noun/v1/{manage_v1.h => manage.h} | 0 pkg/noun/v1/{nock_v1.c => nock.c} | 0 pkg/noun/v1/{nock_v1.h => nock.h} | 0 pkg/noun/v1/{vortex_v1.c => vortex.c} | 0 pkg/noun/v1/{vortex_v1.h => vortex.h} | 0 pkg/noun/v2/{allocate_v2.c => allocate.c} | 0 pkg/noun/v2/{allocate_v2.h => allocate.h} | 0 pkg/noun/v2/{hashtable_v2.c => hashtable.c} | 0 pkg/noun/v2/{hashtable_v2.h => hashtable.h} | 0 pkg/noun/v2/{jets_v2.c => jets.c} | 0 pkg/noun/v2/{jets_v2.h => jets.h} | 0 pkg/noun/v2/{manage_v2.c => manage.c} | 0 pkg/noun/v2/{manage_v2.h => manage.h} | 0 pkg/noun/v2/{nock_v2.c => nock.c} | 0 pkg/noun/v2/{nock_v2.h => nock.h} | 0 pkg/noun/v2/{options_v2.h => options.h} | 0 pkg/noun/v2/{vortex_v2.c => vortex.c} | 0 pkg/noun/v2/{vortex_v2.h => vortex.h} | 0 pkg/noun/v3/{allocate_v3.h => allocate.h} | 0 pkg/noun/v3/{hashtable_v3.c => hashtable.c} | 0 pkg/noun/v3/{hashtable_v3.h => hashtable.h} | 0 pkg/noun/v3/{jets_v3.h => jets.h} | 0 pkg/noun/v3/{manage_v3.c => manage.c} | 0 pkg/noun/v3/{manage_v3.h => manage.h} | 0 pkg/noun/v3/{nock_v3.h => nock.h} | 0 pkg/noun/v3/{vortex_v3.h => vortex.h} | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename pkg/noun/v1/{allocate_v1.c => allocate.c} (100%) rename pkg/noun/v1/{allocate_v1.h => allocate.h} (100%) rename pkg/noun/v1/{hashtable_v1.c => hashtable.c} (100%) rename pkg/noun/v1/{hashtable_v1.h => hashtable.h} (100%) rename pkg/noun/v1/{jets_v1.c => jets.c} (100%) rename pkg/noun/v1/{jets_v1.h => jets.h} (100%) rename pkg/noun/v1/{manage_v1.c => manage.c} (100%) rename pkg/noun/v1/{manage_v1.h => manage.h} (100%) rename pkg/noun/v1/{nock_v1.c => nock.c} (100%) rename pkg/noun/v1/{nock_v1.h => nock.h} (100%) rename pkg/noun/v1/{vortex_v1.c => vortex.c} (100%) rename pkg/noun/v1/{vortex_v1.h => vortex.h} (100%) rename pkg/noun/v2/{allocate_v2.c => allocate.c} (100%) rename pkg/noun/v2/{allocate_v2.h => allocate.h} (100%) rename pkg/noun/v2/{hashtable_v2.c => hashtable.c} (100%) rename pkg/noun/v2/{hashtable_v2.h => hashtable.h} (100%) rename pkg/noun/v2/{jets_v2.c => jets.c} (100%) rename pkg/noun/v2/{jets_v2.h => jets.h} (100%) rename pkg/noun/v2/{manage_v2.c => manage.c} (100%) rename pkg/noun/v2/{manage_v2.h => manage.h} (100%) rename pkg/noun/v2/{nock_v2.c => nock.c} (100%) rename pkg/noun/v2/{nock_v2.h => nock.h} (100%) rename pkg/noun/v2/{options_v2.h => options.h} (100%) rename pkg/noun/v2/{vortex_v2.c => vortex.c} (100%) rename pkg/noun/v2/{vortex_v2.h => vortex.h} (100%) rename pkg/noun/v3/{allocate_v3.h => allocate.h} (100%) rename pkg/noun/v3/{hashtable_v3.c => hashtable.c} (100%) rename pkg/noun/v3/{hashtable_v3.h => hashtable.h} (100%) rename pkg/noun/v3/{jets_v3.h => jets.h} (100%) rename pkg/noun/v3/{manage_v3.c => manage.c} (100%) rename pkg/noun/v3/{manage_v3.h => manage.h} (100%) rename pkg/noun/v3/{nock_v3.h => nock.h} (100%) rename pkg/noun/v3/{vortex_v3.h => vortex.h} (100%) diff --git a/pkg/noun/v1/allocate_v1.c b/pkg/noun/v1/allocate.c similarity index 100% rename from pkg/noun/v1/allocate_v1.c rename to pkg/noun/v1/allocate.c diff --git a/pkg/noun/v1/allocate_v1.h b/pkg/noun/v1/allocate.h similarity index 100% rename from pkg/noun/v1/allocate_v1.h rename to pkg/noun/v1/allocate.h diff --git a/pkg/noun/v1/hashtable_v1.c b/pkg/noun/v1/hashtable.c similarity index 100% rename from pkg/noun/v1/hashtable_v1.c rename to pkg/noun/v1/hashtable.c diff --git a/pkg/noun/v1/hashtable_v1.h b/pkg/noun/v1/hashtable.h similarity index 100% rename from pkg/noun/v1/hashtable_v1.h rename to pkg/noun/v1/hashtable.h diff --git a/pkg/noun/v1/jets_v1.c b/pkg/noun/v1/jets.c similarity index 100% rename from pkg/noun/v1/jets_v1.c rename to pkg/noun/v1/jets.c diff --git a/pkg/noun/v1/jets_v1.h b/pkg/noun/v1/jets.h similarity index 100% rename from pkg/noun/v1/jets_v1.h rename to pkg/noun/v1/jets.h diff --git a/pkg/noun/v1/manage_v1.c b/pkg/noun/v1/manage.c similarity index 100% rename from pkg/noun/v1/manage_v1.c rename to pkg/noun/v1/manage.c diff --git a/pkg/noun/v1/manage_v1.h b/pkg/noun/v1/manage.h similarity index 100% rename from pkg/noun/v1/manage_v1.h rename to pkg/noun/v1/manage.h diff --git a/pkg/noun/v1/nock_v1.c b/pkg/noun/v1/nock.c similarity index 100% rename from pkg/noun/v1/nock_v1.c rename to pkg/noun/v1/nock.c diff --git a/pkg/noun/v1/nock_v1.h b/pkg/noun/v1/nock.h similarity index 100% rename from pkg/noun/v1/nock_v1.h rename to pkg/noun/v1/nock.h diff --git a/pkg/noun/v1/vortex_v1.c b/pkg/noun/v1/vortex.c similarity index 100% rename from pkg/noun/v1/vortex_v1.c rename to pkg/noun/v1/vortex.c diff --git a/pkg/noun/v1/vortex_v1.h b/pkg/noun/v1/vortex.h similarity index 100% rename from pkg/noun/v1/vortex_v1.h rename to pkg/noun/v1/vortex.h diff --git a/pkg/noun/v2/allocate_v2.c b/pkg/noun/v2/allocate.c similarity index 100% rename from pkg/noun/v2/allocate_v2.c rename to pkg/noun/v2/allocate.c diff --git a/pkg/noun/v2/allocate_v2.h b/pkg/noun/v2/allocate.h similarity index 100% rename from pkg/noun/v2/allocate_v2.h rename to pkg/noun/v2/allocate.h diff --git a/pkg/noun/v2/hashtable_v2.c b/pkg/noun/v2/hashtable.c similarity index 100% rename from pkg/noun/v2/hashtable_v2.c rename to pkg/noun/v2/hashtable.c diff --git a/pkg/noun/v2/hashtable_v2.h b/pkg/noun/v2/hashtable.h similarity index 100% rename from pkg/noun/v2/hashtable_v2.h rename to pkg/noun/v2/hashtable.h diff --git a/pkg/noun/v2/jets_v2.c b/pkg/noun/v2/jets.c similarity index 100% rename from pkg/noun/v2/jets_v2.c rename to pkg/noun/v2/jets.c diff --git a/pkg/noun/v2/jets_v2.h b/pkg/noun/v2/jets.h similarity index 100% rename from pkg/noun/v2/jets_v2.h rename to pkg/noun/v2/jets.h diff --git a/pkg/noun/v2/manage_v2.c b/pkg/noun/v2/manage.c similarity index 100% rename from pkg/noun/v2/manage_v2.c rename to pkg/noun/v2/manage.c diff --git a/pkg/noun/v2/manage_v2.h b/pkg/noun/v2/manage.h similarity index 100% rename from pkg/noun/v2/manage_v2.h rename to pkg/noun/v2/manage.h diff --git a/pkg/noun/v2/nock_v2.c b/pkg/noun/v2/nock.c similarity index 100% rename from pkg/noun/v2/nock_v2.c rename to pkg/noun/v2/nock.c diff --git a/pkg/noun/v2/nock_v2.h b/pkg/noun/v2/nock.h similarity index 100% rename from pkg/noun/v2/nock_v2.h rename to pkg/noun/v2/nock.h diff --git a/pkg/noun/v2/options_v2.h b/pkg/noun/v2/options.h similarity index 100% rename from pkg/noun/v2/options_v2.h rename to pkg/noun/v2/options.h diff --git a/pkg/noun/v2/vortex_v2.c b/pkg/noun/v2/vortex.c similarity index 100% rename from pkg/noun/v2/vortex_v2.c rename to pkg/noun/v2/vortex.c diff --git a/pkg/noun/v2/vortex_v2.h b/pkg/noun/v2/vortex.h similarity index 100% rename from pkg/noun/v2/vortex_v2.h rename to pkg/noun/v2/vortex.h diff --git a/pkg/noun/v3/allocate_v3.h b/pkg/noun/v3/allocate.h similarity index 100% rename from pkg/noun/v3/allocate_v3.h rename to pkg/noun/v3/allocate.h diff --git a/pkg/noun/v3/hashtable_v3.c b/pkg/noun/v3/hashtable.c similarity index 100% rename from pkg/noun/v3/hashtable_v3.c rename to pkg/noun/v3/hashtable.c diff --git a/pkg/noun/v3/hashtable_v3.h b/pkg/noun/v3/hashtable.h similarity index 100% rename from pkg/noun/v3/hashtable_v3.h rename to pkg/noun/v3/hashtable.h diff --git a/pkg/noun/v3/jets_v3.h b/pkg/noun/v3/jets.h similarity index 100% rename from pkg/noun/v3/jets_v3.h rename to pkg/noun/v3/jets.h diff --git a/pkg/noun/v3/manage_v3.c b/pkg/noun/v3/manage.c similarity index 100% rename from pkg/noun/v3/manage_v3.c rename to pkg/noun/v3/manage.c diff --git a/pkg/noun/v3/manage_v3.h b/pkg/noun/v3/manage.h similarity index 100% rename from pkg/noun/v3/manage_v3.h rename to pkg/noun/v3/manage.h diff --git a/pkg/noun/v3/nock_v3.h b/pkg/noun/v3/nock.h similarity index 100% rename from pkg/noun/v3/nock_v3.h rename to pkg/noun/v3/nock.h diff --git a/pkg/noun/v3/vortex_v3.h b/pkg/noun/v3/vortex.h similarity index 100% rename from pkg/noun/v3/vortex_v3.h rename to pkg/noun/v3/vortex.h From 36827b3ccb94fd19593c728a78c274af6cb5cf41 Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 16:44:26 +0300 Subject: [PATCH 3/8] Revert "noun: fix includes" This reverts commit ab3db882ba293838bb5bcc4a593bd17c7ac4627e. --- pkg/noun/allocate.h | 2 +- pkg/noun/events.h | 2 +- pkg/noun/hashtable.h | 2 +- pkg/noun/imprison.h | 2 +- pkg/noun/jets.h | 2 +- pkg/noun/jets/e/secp.c | 2 +- pkg/noun/jets/tree.c | 2 +- pkg/noun/manage.c | 8 ++++---- pkg/noun/manage.h | 6 +++--- pkg/noun/nock.h | 2 +- pkg/noun/options.h | 2 +- pkg/noun/retrieve.h | 2 +- pkg/noun/serial.c | 2 +- pkg/noun/serial.h | 2 +- pkg/noun/types.h | 2 +- pkg/noun/urth.c | 2 +- pkg/noun/urth.h | 2 +- pkg/noun/v1/allocate.c | 6 +++--- pkg/noun/v1/allocate.h | 4 ++-- pkg/noun/v1/hashtable.c | 8 ++++---- pkg/noun/v1/hashtable.h | 4 ++-- pkg/noun/v1/jets.c | 12 ++++++------ pkg/noun/v1/jets.h | 4 ++-- pkg/noun/v1/manage.c | 12 ++++++------ pkg/noun/v1/nock.c | 12 ++++++------ pkg/noun/v1/nock.h | 2 +- pkg/noun/v1/vortex.c | 6 +++--- pkg/noun/v1/vortex.h | 4 ++-- pkg/noun/v2/allocate.c | 10 +++++----- pkg/noun/v2/allocate.h | 4 ++-- pkg/noun/v2/hashtable.c | 12 ++++++------ pkg/noun/v2/hashtable.h | 4 ++-- pkg/noun/v2/jets.c | 16 ++++++++-------- pkg/noun/v2/jets.h | 4 ++-- pkg/noun/v2/manage.c | 22 +++++++++++----------- pkg/noun/v2/nock.c | 12 ++++++------ pkg/noun/v2/nock.h | 4 ++-- pkg/noun/v2/options.h | 2 +- pkg/noun/v2/vortex.c | 6 +++--- pkg/noun/v2/vortex.h | 6 +++--- pkg/noun/v3/allocate.h | 4 ++-- pkg/noun/v3/hashtable.c | 10 +++++----- pkg/noun/v3/hashtable.h | 2 +- pkg/noun/v3/jets.h | 2 +- pkg/noun/v3/manage.c | 18 +++++++++--------- pkg/noun/v3/nock.h | 2 +- pkg/noun/v3/vortex.h | 6 +++--- pkg/noun/vortex.h | 2 +- pkg/noun/xtract.h | 2 +- pkg/noun/zave.h | 2 +- 50 files changed, 135 insertions(+), 135 deletions(-) diff --git a/pkg/noun/allocate.h b/pkg/noun/allocate.h index 6409a31266..0fa78cdaf2 100644 --- a/pkg/noun/allocate.h +++ b/pkg/noun/allocate.h @@ -69,7 +69,7 @@ typedef struct { c3_w mug_w; c3_w len_w; - c3_w buf_w[]; + c3_w buf_w[0]; } u3a_atom; typedef struct { diff --git a/pkg/noun/events.h b/pkg/noun/events.h index ff7b7de612..76501db6df 100644 --- a/pkg/noun/events.h +++ b/pkg/noun/events.h @@ -3,7 +3,7 @@ #ifndef U3_EVENTS_H #define U3_EVENTS_H -#include "c3/c3.h" +#include "c3.h" #include "allocate.h" #include "version.h" diff --git a/pkg/noun/hashtable.h b/pkg/noun/hashtable.h index 50daba911f..217546c9c1 100644 --- a/pkg/noun/hashtable.h +++ b/pkg/noun/hashtable.h @@ -1,7 +1,7 @@ #ifndef U3_HASHTABLE_H #define U3_HASHTABLE_H -#include "c3/c3.h" +#include "c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/imprison.h b/pkg/noun/imprison.h index 6d2dcb175d..be8b6040e0 100644 --- a/pkg/noun/imprison.h +++ b/pkg/noun/imprison.h @@ -4,7 +4,7 @@ #define U3_IMPRISON_H #include "allocate.h" -#include "c3/c3.h" +#include "c3.h" #include "gmp.h" #include "types.h" diff --git a/pkg/noun/jets.h b/pkg/noun/jets.h index bfaa68aeaa..cf253a695c 100644 --- a/pkg/noun/jets.h +++ b/pkg/noun/jets.h @@ -4,7 +4,7 @@ #define U3_JETS_H #include "allocate.h" -#include "c3/c3.h" +#include "c3.h" #include "types.h" /** Noun semantics. diff --git a/pkg/noun/jets/e/secp.c b/pkg/noun/jets/e/secp.c index 3717d6b6ce..f5e3a2aa94 100644 --- a/pkg/noun/jets/e/secp.c +++ b/pkg/noun/jets/e/secp.c @@ -5,7 +5,7 @@ #include "noun.h" #include "urcrypt.h" -#include +#include static urcrypt_secp_context* sec_u; diff --git a/pkg/noun/jets/tree.c b/pkg/noun/jets/tree.c index cd1e05aec1..bf06268b5b 100644 --- a/pkg/noun/jets/tree.c +++ b/pkg/noun/jets/tree.c @@ -17,7 +17,7 @@ ``` */ -#include "c3/c3.h" +#include "c3.h" #include "jets.h" #include "jets/w.h" diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c index e5dbcab223..4850064ca9 100644 --- a/pkg/noun/manage.c +++ b/pkg/noun/manage.c @@ -1,8 +1,8 @@ /// @file -#include "manage.h" -#include "manage_v2.h" -#include "manage_v3.h" +#include "pkg/noun/manage.h" +#include "pkg/noun/v2/manage.h" +#include "pkg/noun/v3/manage.h" #include #include @@ -28,7 +28,7 @@ #include "nock.h" #include "openssl/crypto.h" #include "options.h" -#include "rsignal.h" +#include "platform/rsignal.h" #include "retrieve.h" #include "trace.h" #include "urcrypt.h" diff --git a/pkg/noun/manage.h b/pkg/noun/manage.h index 9b220706df..14f9cc503d 100644 --- a/pkg/noun/manage.h +++ b/pkg/noun/manage.h @@ -3,10 +3,10 @@ #ifndef U3_MANAGE_H #define U3_MANAGE_H -#include "manage_v1.h" -#include "manage_v2.h" +#include "v1/manage.h" +#include "v2/manage.h" -#include "c3/c3.h" +#include "c3.h" #include "types.h" #include "version.h" diff --git a/pkg/noun/nock.h b/pkg/noun/nock.h index 3f1830a301..2ee4ccfec8 100644 --- a/pkg/noun/nock.h +++ b/pkg/noun/nock.h @@ -5,7 +5,7 @@ #include -#include "c3/c3.h" +#include "c3.h" #include "jets.h" #include "types.h" #include "zave.h" diff --git a/pkg/noun/options.h b/pkg/noun/options.h index 2f218add57..29ca6ce9d9 100644 --- a/pkg/noun/options.h +++ b/pkg/noun/options.h @@ -3,7 +3,7 @@ #ifndef U3_OPTIONS_H #define U3_OPTIONS_H -#include "c3/c3.h" +#include "c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/retrieve.h b/pkg/noun/retrieve.h index 0e0554b24b..7423ad9f49 100644 --- a/pkg/noun/retrieve.h +++ b/pkg/noun/retrieve.h @@ -3,7 +3,7 @@ #ifndef U3_RETRIEVE_H #define U3_RETRIEVE_H -#include "c3/c3.h" +#include "c3.h" #include "allocate.h" #include "error.h" #include "gmp.h" diff --git a/pkg/noun/serial.c b/pkg/noun/serial.c index 70ced99a68..84302ae8a2 100644 --- a/pkg/noun/serial.c +++ b/pkg/noun/serial.c @@ -11,7 +11,7 @@ #include "jets/q.h" #include "retrieve.h" #include "serial.h" -#include "ur/ur.h" +#include "ur.h" #include "vortex.h" #include "xtract.h" diff --git a/pkg/noun/serial.h b/pkg/noun/serial.h index d7dd5a8eaa..608d702de7 100644 --- a/pkg/noun/serial.h +++ b/pkg/noun/serial.h @@ -3,7 +3,7 @@ #ifndef U3_SERIAL_H #define U3_SERIAL_H -#include "c3/c3.h" +#include "c3.h" #include "imprison.h" #include "types.h" /* constants diff --git a/pkg/noun/types.h b/pkg/noun/types.h index 6819eb6045..c921900f07 100644 --- a/pkg/noun/types.h +++ b/pkg/noun/types.h @@ -5,7 +5,7 @@ #ifndef U3_TYPES_H #define U3_TYPES_H -#include "c3/c3.h" +#include "c3.h" /// Sentinel value for u3_noun types that aren't actually nouns. #define u3_none (u3_noun)0xffffffff diff --git a/pkg/noun/urth.c b/pkg/noun/urth.c index 6eb6f8fcc3..701d235637 100644 --- a/pkg/noun/urth.c +++ b/pkg/noun/urth.c @@ -14,7 +14,7 @@ #include "manage.h" #include "retrieve.h" #include "serial.h" -#include "ur/ur.h" +#include "ur.h" #include "vortex.h" /* _cu_atom_to_ref(): allocate indirect atom off-loom. diff --git a/pkg/noun/urth.h b/pkg/noun/urth.h index e2ab3e6f44..0dc2aa8168 100644 --- a/pkg/noun/urth.h +++ b/pkg/noun/urth.h @@ -3,7 +3,7 @@ #ifndef U3_URTH_H #define U3_URTH_H -#include "c3/c3.h" +#include "c3.h" /** Functions. **/ diff --git a/pkg/noun/v1/allocate.c b/pkg/noun/v1/allocate.c index 3d4a31d5d9..7ce4521ecc 100644 --- a/pkg/noun/v1/allocate.c +++ b/pkg/noun/v1/allocate.c @@ -1,9 +1,9 @@ /// @file -#include "allocate.h" -#include "allocate_v1.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v1/allocate.h" -#include "hashtable_v1.h" +#include "pkg/noun/v1/hashtable.h" /* _box_v1_slot(): select the right free list to search for a block. */ diff --git a/pkg/noun/v1/allocate.h b/pkg/noun/v1/allocate.h index 097d9b10a5..4544417b78 100644 --- a/pkg/noun/v1/allocate.h +++ b/pkg/noun/v1/allocate.h @@ -1,8 +1,8 @@ #ifndef U3_ALLOCATE_V1_H #define U3_ALLOCATE_V1_H -#include "allocate.h" -#include "allocate_v2.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v2/allocate.h" /** Aliases. **/ diff --git a/pkg/noun/v1/hashtable.c b/pkg/noun/v1/hashtable.c index 01126c9303..f191682014 100644 --- a/pkg/noun/v1/hashtable.c +++ b/pkg/noun/v1/hashtable.c @@ -1,10 +1,10 @@ /// @file -#include "hashtable.h" -#include "hashtable_v1.h" +#include "pkg/noun/hashtable.h" +#include "pkg/noun/v1/hashtable.h" -#include "allocate.h" -#include "allocate_v1.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v1/allocate.h" /* _ch_v1_popcount(): number of bits set in word. A standard intrinsic. diff --git a/pkg/noun/v1/hashtable.h b/pkg/noun/v1/hashtable.h index c56fe87516..2d5fdea6f3 100644 --- a/pkg/noun/v1/hashtable.h +++ b/pkg/noun/v1/hashtable.h @@ -1,8 +1,8 @@ #ifndef U3_HASHTABLE_V1_H #define U3_HASHTABLE_V1_H -#include "hashtable.h" -#include "hashtable_v2.h" +#include "pkg/noun/hashtable.h" +#include "pkg/noun/v2/hashtable.h" /** Aliases. **/ diff --git a/pkg/noun/v1/jets.c b/pkg/noun/v1/jets.c index 1b091cfee6..272930e11d 100644 --- a/pkg/noun/v1/jets.c +++ b/pkg/noun/v1/jets.c @@ -1,13 +1,13 @@ /// @file -#include "vortex.h" +#include "pkg/noun/vortex.h" -#include "jets.h" -#include "jets_v1.h" -#include "jets_v2.h" +#include "pkg/noun/jets.h" +#include "pkg/noun/v1/jets.h" +#include "pkg/noun/v2/jets.h" -#include "allocate_v1.h" -#include "hashtable_v1.h" +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v1/hashtable.h" /* _cj_fink_free(): lose and free everything in a u3j_v1_fink. diff --git a/pkg/noun/v1/jets.h b/pkg/noun/v1/jets.h index 52e3bc1bf4..bf3dfe6afe 100644 --- a/pkg/noun/v1/jets.h +++ b/pkg/noun/v1/jets.h @@ -3,8 +3,8 @@ #ifndef U3_JETS_V1_H #define U3_JETS_V1_H -#include "jets.h" -#include "jets_v2.h" +#include "pkg/noun/jets.h" +#include "pkg/noun/v2/jets.h" /** Aliases. **/ diff --git a/pkg/noun/v1/manage.c b/pkg/noun/v1/manage.c index 03595c35a2..0eac6a8d7b 100644 --- a/pkg/noun/v1/manage.c +++ b/pkg/noun/v1/manage.c @@ -1,12 +1,12 @@ /// @file -#include "manage_v1.h" +#include "pkg/noun/v1/manage.h" -#include "allocate_v1.h" -#include "hashtable_v1.h" -#include "jets_v1.h" -#include "nock_v1.h" -#include "vortex_v1.h" +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v1/hashtable.h" +#include "pkg/noun/v1/jets.h" +#include "pkg/noun/v1/nock.h" +#include "pkg/noun/v1/vortex.h" /* u3m_v1_reclaim: clear persistent caches to reclaim memory */ diff --git a/pkg/noun/v1/nock.c b/pkg/noun/v1/nock.c index fc70ace4ad..437067452f 100644 --- a/pkg/noun/v1/nock.c +++ b/pkg/noun/v1/nock.c @@ -1,12 +1,12 @@ /// @file -#include "nock.h" -#include "nock_v1.h" +#include "pkg/noun/nock.h" +#include "pkg/noun/v1/nock.h" -#include "allocate_v1.h" -#include "hashtable_v1.h" -#include "jets.h" -#include "jets_v1.h" +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v1/hashtable.h" +#include "pkg/noun/jets.h" +#include "pkg/noun/v1/jets.h" /* u3n_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v1/nock.h b/pkg/noun/v1/nock.h index 6b335d94de..5320307b6b 100644 --- a/pkg/noun/v1/nock.h +++ b/pkg/noun/v1/nock.h @@ -3,7 +3,7 @@ #ifndef U3_NOCK_V1_H #define U3_NOCK_V1_H -#include "nock_v2.h" +#include "pkg/noun/v2/nock.h" /** Aliases. **/ diff --git a/pkg/noun/v1/vortex.c b/pkg/noun/v1/vortex.c index a0cd95bf3f..e1ec21b22d 100644 --- a/pkg/noun/v1/vortex.c +++ b/pkg/noun/v1/vortex.c @@ -1,9 +1,9 @@ /// @file -#include "vortex.h" -#include "vortex_v1.h" +#include "pkg/noun/vortex.h" +#include "pkg/noun/v1/vortex.h" -#include "allocate_v1.h" +#include "pkg/noun/v1/allocate.h" /* u3v_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v1/vortex.h b/pkg/noun/v1/vortex.h index e158a28173..84cf6e405c 100644 --- a/pkg/noun/v1/vortex.h +++ b/pkg/noun/v1/vortex.h @@ -3,8 +3,8 @@ #ifndef U3_VORTEX_V1_H #define U3_VORTEX_V1_H -#include "allocate.h" -#include "vortex_v2.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v2/vortex.h" /** Aliases. **/ diff --git a/pkg/noun/v2/allocate.c b/pkg/noun/v2/allocate.c index e99808d1b2..25cf04a948 100644 --- a/pkg/noun/v2/allocate.c +++ b/pkg/noun/v2/allocate.c @@ -1,12 +1,12 @@ /// @file -#include "allocate.h" -#include "allocate_v1.h" -#include "allocate_v2.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v2/allocate.h" -#include "hashtable_v2.h" +#include "pkg/noun/v2/hashtable.h" #include "log.h" -#include "manage_v2.h" +#include "pkg/noun/v2/manage.h" #include "options.h" #include "retrieve.h" #include "trace.h" diff --git a/pkg/noun/v2/allocate.h b/pkg/noun/v2/allocate.h index 7a9acd034b..1f191795fc 100644 --- a/pkg/noun/v2/allocate.h +++ b/pkg/noun/v2/allocate.h @@ -1,9 +1,9 @@ #ifndef U3_ALLOCATE_V2_H #define U3_ALLOCATE_V2_H -#include "allocate.h" +#include "pkg/noun/allocate.h" -#include "manage_v2.h" +#include "pkg/noun/v2/manage.h" #include "options.h" /** Aliases. diff --git a/pkg/noun/v2/hashtable.c b/pkg/noun/v2/hashtable.c index adb714f7e2..6963d07fde 100644 --- a/pkg/noun/v2/hashtable.c +++ b/pkg/noun/v2/hashtable.c @@ -1,12 +1,12 @@ /// @file -#include "hashtable.h" -#include "hashtable_v1.h" -#include "hashtable_v2.h" +#include "pkg/noun/hashtable.h" +#include "pkg/noun/v1/hashtable.h" +#include "pkg/noun/v2/hashtable.h" -#include "allocate.h" -#include "allocate_v1.h" -#include "allocate_v2.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v2/allocate.h" /* _ch_v2_popcount(): number of bits set in word. A standard intrinsic. ** NB: copy of _ch_v2_popcount in pkg/noun/hashtable.c diff --git a/pkg/noun/v2/hashtable.h b/pkg/noun/v2/hashtable.h index 5a637e2d71..09025fc19f 100644 --- a/pkg/noun/v2/hashtable.h +++ b/pkg/noun/v2/hashtable.h @@ -13,9 +13,9 @@ #define u3h_v2_walk u3h_walk #define u3h_v2_walk_with u3h_walk_with -#include "hashtable.h" +#include "pkg/noun/hashtable.h" -#include "c3/c3.h" +#include "c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/v2/jets.c b/pkg/noun/v2/jets.c index 6d30839390..27a5347ad3 100644 --- a/pkg/noun/v2/jets.c +++ b/pkg/noun/v2/jets.c @@ -1,16 +1,16 @@ /// @file -#include "vortex.h" +#include "pkg/noun/vortex.h" -#include "jets.h" -#include "jets_v2.h" +#include "pkg/noun/jets.h" +#include "pkg/noun/v2/jets.h" -#include "allocate_v2.h" -#include "hashtable_v2.h" -#include "vortex_v2.h" +#include "pkg/noun/v2/allocate.h" +#include "pkg/noun/v2/hashtable.h" +#include "pkg/noun/v2/vortex.h" -#include "hashtable_v3.h" -#include "jets_v3.h" +#include "pkg/noun/v3/hashtable.h" +#include "pkg/noun/v3/jets.h" /* u3j_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v2/jets.h b/pkg/noun/v2/jets.h index 414adf58d2..3feed48feb 100644 --- a/pkg/noun/v2/jets.h +++ b/pkg/noun/v2/jets.h @@ -3,8 +3,8 @@ #ifndef U3_JETS_V2_H #define U3_JETS_V2_H -#include "allocate.h" -#include "jets.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/jets.h" /** Aliases. diff --git a/pkg/noun/v2/manage.c b/pkg/noun/v2/manage.c index 85dd39233a..76d5b57b98 100644 --- a/pkg/noun/v2/manage.c +++ b/pkg/noun/v2/manage.c @@ -1,16 +1,16 @@ /// @file -#include "manage_v2.h" - -#include "allocate_v1.h" -#include "allocate_v2.h" -#include "hashtable_v2.h" -#include "jets_v2.h" -#include "nock_v2.h" -#include "options_v2.h" -#include "vortex.h" -#include "vortex_v1.h" -#include "vortex_v2.h" +#include "pkg/noun/v2/manage.h" + +#include "pkg/noun/v1/allocate.h" +#include "pkg/noun/v2/allocate.h" +#include "pkg/noun/v2/hashtable.h" +#include "pkg/noun/v2/jets.h" +#include "pkg/noun/v2/nock.h" +#include "pkg/noun/v2/options.h" +#include "pkg/noun/vortex.h" +#include "pkg/noun/v1/vortex.h" +#include "pkg/noun/v2/vortex.h" /* _cm_pack_rewrite(): trace through arena, rewriting pointers. */ diff --git a/pkg/noun/v2/nock.c b/pkg/noun/v2/nock.c index 0558815786..dd70cc732e 100644 --- a/pkg/noun/v2/nock.c +++ b/pkg/noun/v2/nock.c @@ -1,14 +1,14 @@ /// @file -#include "nock_v2.h" +#include "pkg/noun/v2/nock.h" -#include "vortex.h" +#include "pkg/noun/vortex.h" -#include "allocate_v2.h" -#include "hashtable_v2.h" -#include "vortex_v2.h" +#include "pkg/noun/v2/allocate.h" +#include "pkg/noun/v2/hashtable.h" +#include "pkg/noun/v2/vortex.h" -#include "hashtable_v3.h" +#include "pkg/noun/v3/hashtable.h" /* u3n_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v2/nock.h b/pkg/noun/v2/nock.h index 9662ba3241..dcc93d2143 100644 --- a/pkg/noun/v2/nock.h +++ b/pkg/noun/v2/nock.h @@ -3,9 +3,9 @@ #ifndef U3_NOCK_V2_H #define U3_NOCK_V2_H -#include "nock_v3.h" +#include "pkg/noun/v3/nock.h" -#include "jets_v2.h" +#include "pkg/noun/v2/jets.h" #include "types.h" diff --git a/pkg/noun/v2/options.h b/pkg/noun/v2/options.h index c0684f5fb4..4af573f20d 100644 --- a/pkg/noun/v2/options.h +++ b/pkg/noun/v2/options.h @@ -3,7 +3,7 @@ #ifndef U3_OPTIONS_V2_H #define U3_OPTIONS_V2_H -#include "options.h" +#include "pkg/noun/options.h" /** Globals. **/ diff --git a/pkg/noun/v2/vortex.c b/pkg/noun/v2/vortex.c index 5e41447853..4656ed2461 100644 --- a/pkg/noun/v2/vortex.c +++ b/pkg/noun/v2/vortex.c @@ -1,9 +1,9 @@ /// @file -#include "vortex.h" -#include "vortex_v2.h" +#include "pkg/noun/vortex.h" +#include "pkg/noun/v2/vortex.h" -#include "allocate_v2.h" +#include "pkg/noun/v2/allocate.h" u3v_v2_home* u3v_v2_Home; diff --git a/pkg/noun/v2/vortex.h b/pkg/noun/v2/vortex.h index 0897e0f14e..d15910fb33 100644 --- a/pkg/noun/v2/vortex.h +++ b/pkg/noun/v2/vortex.h @@ -3,10 +3,10 @@ #ifndef U3_VORTEX_V2_H #define U3_VORTEX_V2_H -#include "vortex.h" +#include "pkg/noun/vortex.h" -#include "allocate_v2.h" -#include "version.h" +#include "pkg/noun/v2/allocate.h" +#include "pkg/noun/version.h" /** Aliases. **/ diff --git a/pkg/noun/v3/allocate.h b/pkg/noun/v3/allocate.h index 3231d96af0..bacc79e174 100644 --- a/pkg/noun/v3/allocate.h +++ b/pkg/noun/v3/allocate.h @@ -1,9 +1,9 @@ #ifndef U3_ALLOCATE_V3_H #define U3_ALLOCATE_V3_H -#include "allocate.h" +#include "pkg/noun/allocate.h" -#include "manage_v3.h" +#include "pkg/noun/v3/manage.h" #include "options.h" /** Aliases. diff --git a/pkg/noun/v3/hashtable.c b/pkg/noun/v3/hashtable.c index 746a9a6d52..b17d7b6e78 100644 --- a/pkg/noun/v3/hashtable.c +++ b/pkg/noun/v3/hashtable.c @@ -1,12 +1,12 @@ /// @file -#include "hashtable_v3.h" +#include "pkg/noun/v3/hashtable.h" -#include "allocate.h" -#include "vortex.h" +#include "pkg/noun/allocate.h" +#include "pkg/noun/vortex.h" -#include "allocate_v3.h" -#include "vortex_v3.h" +#include "pkg/noun/v3/allocate.h" +#include "pkg/noun/v3/vortex.h" /* u3h_v3_new_cache(): create hashtable with bounded size. */ diff --git a/pkg/noun/v3/hashtable.h b/pkg/noun/v3/hashtable.h index 65249da054..14e0e47753 100644 --- a/pkg/noun/v3/hashtable.h +++ b/pkg/noun/v3/hashtable.h @@ -6,7 +6,7 @@ #define u3h_v3_root u3h_root #define u3h_v3_walk u3h_walk -#include "hashtable.h" +#include "pkg/noun/hashtable.h" /** Functions. **/ diff --git a/pkg/noun/v3/jets.h b/pkg/noun/v3/jets.h index 1255177426..a0fe54f9d7 100644 --- a/pkg/noun/v3/jets.h +++ b/pkg/noun/v3/jets.h @@ -3,7 +3,7 @@ #ifndef U3_JETS_V3_H #define U3_JETS_V3_H -#include "jets.h" +#include "pkg/noun/jets.h" /** Aliases. **/ diff --git a/pkg/noun/v3/manage.c b/pkg/noun/v3/manage.c index 05b82b307b..3750262493 100644 --- a/pkg/noun/v3/manage.c +++ b/pkg/noun/v3/manage.c @@ -1,16 +1,16 @@ /// @file -#include "manage_v3.h" +#include "pkg/noun/v3/manage.h" -#include "jets_v2.h" -#include "nock_v2.h" -#include "vortex_v2.h" +#include "pkg/noun/v2/jets.h" +#include "pkg/noun/v2/nock.h" +#include "pkg/noun/v2/vortex.h" -#include "allocate_v3.h" -#include "hashtable_v3.h" -#include "version.h" -#include "vortex_v3.h" -#include +#include "pkg/noun/v3/allocate.h" +#include "pkg/noun/v3/hashtable.h" +#include "pkg/noun/version.h" +#include "pkg/noun/v3/vortex.h" +#include /* u3m_v3_migrate: perform loom migration if necessary. */ diff --git a/pkg/noun/v3/nock.h b/pkg/noun/v3/nock.h index 29453d99bc..a7b208ba99 100644 --- a/pkg/noun/v3/nock.h +++ b/pkg/noun/v3/nock.h @@ -3,7 +3,7 @@ #ifndef U3_NOCK_V3_H #define U3_NOCK_V3_H -#include "nock.h" +#include "pkg/noun/nock.h" #include "types.h" diff --git a/pkg/noun/v3/vortex.h b/pkg/noun/v3/vortex.h index 117ed32f17..d47ac19654 100644 --- a/pkg/noun/v3/vortex.h +++ b/pkg/noun/v3/vortex.h @@ -3,10 +3,10 @@ #ifndef U3_VORTEX_V3_H #define U3_VORTEX_V3_H -#include "vortex.h" +#include "pkg/noun/vortex.h" -#include "allocate_v3.h" -#include "version.h" +#include "pkg/noun/v3/allocate.h" +#include "pkg/noun/version.h" /** Aliases. **/ diff --git a/pkg/noun/vortex.h b/pkg/noun/vortex.h index 9cc56474e0..057be859d4 100644 --- a/pkg/noun/vortex.h +++ b/pkg/noun/vortex.h @@ -4,7 +4,7 @@ #define U3_VORTEX_H #include "allocate.h" -#include "c3/c3.h" +#include "c3.h" #include "imprison.h" #include "version.h" diff --git a/pkg/noun/xtract.h b/pkg/noun/xtract.h index 8f9da2e26d..343690a8f2 100644 --- a/pkg/noun/xtract.h +++ b/pkg/noun/xtract.h @@ -3,7 +3,7 @@ #ifndef U3_XTRACT_H #define U3_XTRACT_H -#include "c3/c3.h" +#include "c3.h" #include "types.h" #include "allocate.h" #include "manage.h" diff --git a/pkg/noun/zave.h b/pkg/noun/zave.h index 3c9d74da0b..feff83f664 100644 --- a/pkg/noun/zave.h +++ b/pkg/noun/zave.h @@ -3,7 +3,7 @@ #ifndef U3_ZAVE_H #define U3_ZAVE_H -#include "c3/c3.h" +#include "c3.h" #include "types.h" /** Memoization. From 0a360b557c6d45d3c8cafa58b5a453b6ab8fb4df Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 16:45:02 +0300 Subject: [PATCH 4/8] Revert "vere: fix includes" This reverts commit 47c7831b9d55d694b8e36cd12c64a68d98c33fa3. --- pkg/vere/benchmarks.c | 2 +- pkg/vere/boot_tests.c | 2 +- pkg/vere/db/lmdb.c | 2 +- pkg/vere/db/lmdb.h | 2 +- pkg/vere/io/ames.c | 4 ++-- pkg/vere/king.c | 2 +- pkg/vere/lord.c | 2 +- pkg/vere/main.c | 4 ++-- pkg/vere/mars.c | 4 +++- pkg/vere/mars.h | 2 -- pkg/vere/noun_tests.c | 2 +- pkg/vere/pier.c | 2 +- pkg/vere/platform/darwin/ptty.c | 2 +- pkg/vere/platform/linux/ptty.c | 2 +- pkg/vere/serf.c | 2 +- pkg/vere/serf.h | 2 -- pkg/vere/vere.h | 2 ++ 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/vere/benchmarks.c b/pkg/vere/benchmarks.c index 9898217c5e..a9215cf864 100644 --- a/pkg/vere/benchmarks.c +++ b/pkg/vere/benchmarks.c @@ -2,7 +2,7 @@ #include "noun.h" #include "jets/q.h" -#include "ur/ur.h" +#include "ur.h" #include "vere.h" /* _setup(): prepare for tests. diff --git a/pkg/vere/boot_tests.c b/pkg/vere/boot_tests.c index d9728d88cf..3276834d69 100644 --- a/pkg/vere/boot_tests.c +++ b/pkg/vere/boot_tests.c @@ -2,7 +2,7 @@ #include "ivory.h" #include "noun.h" -#include "ur/ur.h" +#include "ur.h" #include "vere.h" /* _setup(): prepare for tests. diff --git a/pkg/vere/db/lmdb.c b/pkg/vere/db/lmdb.c index 61158e3d54..a31bbd1de6 100644 --- a/pkg/vere/db/lmdb.c +++ b/pkg/vere/db/lmdb.c @@ -4,7 +4,7 @@ #include -#include "c3/c3.h" +#include "c3.h" #include "noun.h" /* mdb_logerror(): writes an error message and lmdb error code to f. diff --git a/pkg/vere/db/lmdb.h b/pkg/vere/db/lmdb.h index e630cf4dd2..43c6b433ff 100644 --- a/pkg/vere/db/lmdb.h +++ b/pkg/vere/db/lmdb.h @@ -3,7 +3,7 @@ #ifndef U3_VERE_DB_LMDB_H #define U3_VERE_DB_LMDB_H -#include "c3/c3.h" +#include "c3.h" #include "lmdb/lmdb.h" /* lmdb api wrapper diff --git a/pkg/vere/io/ames.c b/pkg/vere/io/ames.c index 5f2b300aa2..165b57fd18 100644 --- a/pkg/vere/io/ames.c +++ b/pkg/vere/io/ames.c @@ -5,12 +5,12 @@ #include "io/ames/stun.h" #include "noun.h" -#include "ur/ur.h" +#include "ur.h" #include "zlib.h" #include "natpmp.h" -#include +#include #include diff --git a/pkg/vere/king.c b/pkg/vere/king.c index 8d5402cb30..0cf555a3d1 100644 --- a/pkg/vere/king.c +++ b/pkg/vere/king.c @@ -8,7 +8,7 @@ #include "ivory.h" #include "noun.h" #include "pace.h" -#include "ur/ur.h" +#include "ur.h" #include "uv.h" #include "version.h" diff --git a/pkg/vere/lord.c b/pkg/vere/lord.c index b7c03dfe6f..ded3bc824d 100644 --- a/pkg/vere/lord.c +++ b/pkg/vere/lord.c @@ -3,7 +3,7 @@ #include "vere.h" #include "noun.h" -#include "ur/ur.h" +#include "ur.h" #undef LORD_TRACE_JAM #undef LORD_TRACE_CUE diff --git a/pkg/vere/main.c b/pkg/vere/main.c index 21a2c9aa99..f78031c70e 100644 --- a/pkg/vere/main.c +++ b/pkg/vere/main.c @@ -5,8 +5,8 @@ #include "noun.h" #include "events.h" // XX remove, see full replay in _cw_play() #include "ivory.h" -#include "ur/ur.h" -#include "rsignal.h" +#include "ur.h" +#include "platform/rsignal.h" #include "vere.h" #include "sigsegv.h" #include "openssl/conf.h" diff --git a/pkg/vere/mars.c b/pkg/vere/mars.c index ec27f44979..db9056a0ab 100644 --- a/pkg/vere/mars.c +++ b/pkg/vere/mars.c @@ -2,10 +2,12 @@ ** ** the main loop of a mars process. */ +#include "c3.h" #include "noun.h" #include "types.h" +#include "vere.h" #include "ivory.h" -#include "ur/ur.h" +#include "ur.h" #include "db/lmdb.h" #include #include diff --git a/pkg/vere/mars.h b/pkg/vere/mars.h index 43e1958ae7..552f1a9dea 100644 --- a/pkg/vere/mars.h +++ b/pkg/vere/mars.h @@ -1,7 +1,5 @@ #ifndef U3_VERE_MARS_H #define U3_VERE_MARS_H -#include "c3/c3.h" -#include "vere.h" /** Data types. **/ diff --git a/pkg/vere/noun_tests.c b/pkg/vere/noun_tests.c index f26444fc01..037cd04c14 100644 --- a/pkg/vere/noun_tests.c +++ b/pkg/vere/noun_tests.c @@ -2,7 +2,7 @@ #include "noun.h" #include "ivory.h" -#include "ur/ur.h" +#include "ur.h" #include "vere.h" #define TRUE 1 diff --git a/pkg/vere/pier.c b/pkg/vere/pier.c index 1e8c25b110..23d96bd377 100644 --- a/pkg/vere/pier.c +++ b/pkg/vere/pier.c @@ -1,7 +1,7 @@ /// @file #include "db/lmdb.h" -#include "ent/ent.h" +#include "ent.h" #include "noun.h" #include "pace.h" #include "vere.h" diff --git a/pkg/vere/platform/darwin/ptty.c b/pkg/vere/platform/darwin/ptty.c index a1ec334507..3f66ee18f8 100644 --- a/pkg/vere/platform/darwin/ptty.c +++ b/pkg/vere/platform/darwin/ptty.c @@ -1,6 +1,6 @@ /// @file -#include "c3/c3.h" +#include "c3.h" #include "noun.h" #include "vere.h" #include diff --git a/pkg/vere/platform/linux/ptty.c b/pkg/vere/platform/linux/ptty.c index a1ec334507..3f66ee18f8 100644 --- a/pkg/vere/platform/linux/ptty.c +++ b/pkg/vere/platform/linux/ptty.c @@ -1,6 +1,6 @@ /// @file -#include "c3/c3.h" +#include "c3.h" #include "noun.h" #include "vere.h" #include diff --git a/pkg/vere/serf.c b/pkg/vere/serf.c index 78ca9708c2..cec8bece55 100644 --- a/pkg/vere/serf.c +++ b/pkg/vere/serf.c @@ -4,7 +4,7 @@ #include "vere.h" #include "ivory.h" -#include "ur/ur.h" +#include "ur.h" /* |% diff --git a/pkg/vere/serf.h b/pkg/vere/serf.h index 258f7ddf1f..7cd2ca47d0 100644 --- a/pkg/vere/serf.h +++ b/pkg/vere/serf.h @@ -1,7 +1,5 @@ #ifndef U3_VERE_SERF_H #define U3_VERE_SERF_H -#include "c3/c3.h" -#include "noun.h" /** Data types. **/ diff --git a/pkg/vere/vere.h b/pkg/vere/vere.h index 33162ad061..dab95c5080 100644 --- a/pkg/vere/vere.h +++ b/pkg/vere/vere.h @@ -3,7 +3,9 @@ #ifndef U3_VERE_H #define U3_VERE_H +#include "c3.h" #include "db/lmdb.h" +#include "noun.h" #include "serf.h" #include "uv.h" #include From 51a4a05ee376fd65e6e934f641200d9a8cf24a53 Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 17:42:29 +0300 Subject: [PATCH 5/8] zig: reflect previous noun api reverts in pkg_noun c sources --- build.zig | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build.zig b/build.zig index 2ac88948c0..a0e1b26f82 100644 --- a/build.zig +++ b/build.zig @@ -687,20 +687,20 @@ fn build_single( "serial.c", "trace.c", "urth.c", - "allocate_v1.c", - "hashtable_v1.c", - "jets_v1.c", - "manage_v1.c", - "nock_v1.c", - "vortex_v1.c", - "allocate_v2.c", - "hashtable_v2.c", - "jets_v2.c", - "manage_v2.c", - "nock_v2.c", - "vortex_v2.c", - "hashtable_v3.c", - "manage_v3.c", + "v1/allocate.c", + "v1/hashtable.c", + "v1/jets.c", + "v1/manage.c", + "v1/nock.c", + "v1/vortex.c", + "v2/allocate.c", + "v2/hashtable.c", + "v2/jets.c", + "v2/manage.c", + "v2/nock.c", + "v2/vortex.c", + "v3/hashtable.c", + "v3/manage.c", "vortex.c", "xtract.c", "zave.c", From 85862c551954334aed28cc319a61cef37271544a Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 18:03:36 +0300 Subject: [PATCH 6/8] noun: reflect previous noun api reverts in includes --- pkg/noun/manage.c | 6 +++--- pkg/noun/v1/allocate.c | 6 +++--- pkg/noun/v1/allocate.h | 4 ++-- pkg/noun/v1/hashtable.c | 8 ++++---- pkg/noun/v1/hashtable.h | 4 ++-- pkg/noun/v1/jets.c | 12 ++++++------ pkg/noun/v1/jets.h | 4 ++-- pkg/noun/v1/manage.c | 12 ++++++------ pkg/noun/v1/nock.c | 12 ++++++------ pkg/noun/v1/nock.h | 2 +- pkg/noun/v1/vortex.c | 6 +++--- pkg/noun/v1/vortex.h | 4 ++-- pkg/noun/v2/allocate.c | 10 +++++----- pkg/noun/v2/allocate.h | 4 ++-- pkg/noun/v2/hashtable.c | 12 ++++++------ pkg/noun/v2/hashtable.h | 2 +- pkg/noun/v2/jets.c | 16 ++++++++-------- pkg/noun/v2/jets.h | 4 ++-- pkg/noun/v2/manage.c | 22 +++++++++++----------- pkg/noun/v2/nock.c | 12 ++++++------ pkg/noun/v2/nock.h | 4 ++-- pkg/noun/v2/options.h | 2 +- pkg/noun/v2/vortex.c | 6 +++--- pkg/noun/v2/vortex.h | 6 +++--- pkg/noun/v3/allocate.h | 4 ++-- pkg/noun/v3/hashtable.c | 10 +++++----- pkg/noun/v3/hashtable.h | 2 +- pkg/noun/v3/jets.h | 2 +- pkg/noun/v3/manage.c | 18 +++++++++--------- pkg/noun/v3/nock.h | 2 +- pkg/noun/v3/vortex.h | 6 +++--- 31 files changed, 112 insertions(+), 112 deletions(-) diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c index 4850064ca9..69db1c4678 100644 --- a/pkg/noun/manage.c +++ b/pkg/noun/manage.c @@ -1,8 +1,8 @@ /// @file -#include "pkg/noun/manage.h" -#include "pkg/noun/v2/manage.h" -#include "pkg/noun/v3/manage.h" +#include "manage.h" +#include "v2/manage.h" +#include "v3/manage.h" #include #include diff --git a/pkg/noun/v1/allocate.c b/pkg/noun/v1/allocate.c index 7ce4521ecc..191e818de4 100644 --- a/pkg/noun/v1/allocate.c +++ b/pkg/noun/v1/allocate.c @@ -1,9 +1,9 @@ /// @file -#include "pkg/noun/allocate.h" -#include "pkg/noun/v1/allocate.h" +#include "../allocate.h" +#include "v1/allocate.h" -#include "pkg/noun/v1/hashtable.h" +#include "v1/hashtable.h" /* _box_v1_slot(): select the right free list to search for a block. */ diff --git a/pkg/noun/v1/allocate.h b/pkg/noun/v1/allocate.h index 4544417b78..965db14e40 100644 --- a/pkg/noun/v1/allocate.h +++ b/pkg/noun/v1/allocate.h @@ -1,8 +1,8 @@ #ifndef U3_ALLOCATE_V1_H #define U3_ALLOCATE_V1_H -#include "pkg/noun/allocate.h" -#include "pkg/noun/v2/allocate.h" +#include "../allocate.h" +#include "v2/allocate.h" /** Aliases. **/ diff --git a/pkg/noun/v1/hashtable.c b/pkg/noun/v1/hashtable.c index f191682014..6c70a94487 100644 --- a/pkg/noun/v1/hashtable.c +++ b/pkg/noun/v1/hashtable.c @@ -1,10 +1,10 @@ /// @file -#include "pkg/noun/hashtable.h" -#include "pkg/noun/v1/hashtable.h" +#include "../hashtable.h" +#include "v1/hashtable.h" -#include "pkg/noun/allocate.h" -#include "pkg/noun/v1/allocate.h" +#include "../allocate.h" +#include "v1/allocate.h" /* _ch_v1_popcount(): number of bits set in word. A standard intrinsic. diff --git a/pkg/noun/v1/hashtable.h b/pkg/noun/v1/hashtable.h index 2d5fdea6f3..74395cb74c 100644 --- a/pkg/noun/v1/hashtable.h +++ b/pkg/noun/v1/hashtable.h @@ -1,8 +1,8 @@ #ifndef U3_HASHTABLE_V1_H #define U3_HASHTABLE_V1_H -#include "pkg/noun/hashtable.h" -#include "pkg/noun/v2/hashtable.h" +#include "../hashtable.h" +#include "v2/hashtable.h" /** Aliases. **/ diff --git a/pkg/noun/v1/jets.c b/pkg/noun/v1/jets.c index 272930e11d..a798ccca39 100644 --- a/pkg/noun/v1/jets.c +++ b/pkg/noun/v1/jets.c @@ -1,13 +1,13 @@ /// @file -#include "pkg/noun/vortex.h" +#include "../vortex.h" -#include "pkg/noun/jets.h" -#include "pkg/noun/v1/jets.h" -#include "pkg/noun/v2/jets.h" +#include "../jets.h" +#include "v1/jets.h" +#include "v2/jets.h" -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v1/hashtable.h" +#include "v1/allocate.h" +#include "v1/hashtable.h" /* _cj_fink_free(): lose and free everything in a u3j_v1_fink. diff --git a/pkg/noun/v1/jets.h b/pkg/noun/v1/jets.h index bf3dfe6afe..0bcaf59e61 100644 --- a/pkg/noun/v1/jets.h +++ b/pkg/noun/v1/jets.h @@ -3,8 +3,8 @@ #ifndef U3_JETS_V1_H #define U3_JETS_V1_H -#include "pkg/noun/jets.h" -#include "pkg/noun/v2/jets.h" +#include "../jets.h" +#include "v2/jets.h" /** Aliases. **/ diff --git a/pkg/noun/v1/manage.c b/pkg/noun/v1/manage.c index 0eac6a8d7b..5e353d3446 100644 --- a/pkg/noun/v1/manage.c +++ b/pkg/noun/v1/manage.c @@ -1,12 +1,12 @@ /// @file -#include "pkg/noun/v1/manage.h" +#include "v1/manage.h" -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v1/hashtable.h" -#include "pkg/noun/v1/jets.h" -#include "pkg/noun/v1/nock.h" -#include "pkg/noun/v1/vortex.h" +#include "v1/allocate.h" +#include "v1/hashtable.h" +#include "v1/jets.h" +#include "v1/nock.h" +#include "v1/vortex.h" /* u3m_v1_reclaim: clear persistent caches to reclaim memory */ diff --git a/pkg/noun/v1/nock.c b/pkg/noun/v1/nock.c index 437067452f..aa1dc9ca10 100644 --- a/pkg/noun/v1/nock.c +++ b/pkg/noun/v1/nock.c @@ -1,12 +1,12 @@ /// @file -#include "pkg/noun/nock.h" -#include "pkg/noun/v1/nock.h" +#include "../nock.h" +#include "v1/nock.h" -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v1/hashtable.h" -#include "pkg/noun/jets.h" -#include "pkg/noun/v1/jets.h" +#include "v1/allocate.h" +#include "v1/hashtable.h" +#include "../jets.h" +#include "v1/jets.h" /* u3n_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v1/nock.h b/pkg/noun/v1/nock.h index 5320307b6b..3df2951975 100644 --- a/pkg/noun/v1/nock.h +++ b/pkg/noun/v1/nock.h @@ -3,7 +3,7 @@ #ifndef U3_NOCK_V1_H #define U3_NOCK_V1_H -#include "pkg/noun/v2/nock.h" +#include "v2/nock.h" /** Aliases. **/ diff --git a/pkg/noun/v1/vortex.c b/pkg/noun/v1/vortex.c index e1ec21b22d..07daf7ab9e 100644 --- a/pkg/noun/v1/vortex.c +++ b/pkg/noun/v1/vortex.c @@ -1,9 +1,9 @@ /// @file -#include "pkg/noun/vortex.h" -#include "pkg/noun/v1/vortex.h" +#include "../vortex.h" +#include "v1/vortex.h" -#include "pkg/noun/v1/allocate.h" +#include "v1/allocate.h" /* u3v_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v1/vortex.h b/pkg/noun/v1/vortex.h index 84cf6e405c..92743f746d 100644 --- a/pkg/noun/v1/vortex.h +++ b/pkg/noun/v1/vortex.h @@ -3,8 +3,8 @@ #ifndef U3_VORTEX_V1_H #define U3_VORTEX_V1_H -#include "pkg/noun/allocate.h" -#include "pkg/noun/v2/vortex.h" +#include "../allocate.h" +#include "v2/vortex.h" /** Aliases. **/ diff --git a/pkg/noun/v2/allocate.c b/pkg/noun/v2/allocate.c index 25cf04a948..0476f8a8f5 100644 --- a/pkg/noun/v2/allocate.c +++ b/pkg/noun/v2/allocate.c @@ -1,12 +1,12 @@ /// @file -#include "pkg/noun/allocate.h" -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v2/allocate.h" +#include "../allocate.h" +#include "v1/allocate.h" +#include "v2/allocate.h" -#include "pkg/noun/v2/hashtable.h" +#include "v2/hashtable.h" #include "log.h" -#include "pkg/noun/v2/manage.h" +#include "v2/manage.h" #include "options.h" #include "retrieve.h" #include "trace.h" diff --git a/pkg/noun/v2/allocate.h b/pkg/noun/v2/allocate.h index 1f191795fc..8832977558 100644 --- a/pkg/noun/v2/allocate.h +++ b/pkg/noun/v2/allocate.h @@ -1,9 +1,9 @@ #ifndef U3_ALLOCATE_V2_H #define U3_ALLOCATE_V2_H -#include "pkg/noun/allocate.h" +#include "../allocate.h" -#include "pkg/noun/v2/manage.h" +#include "v2/manage.h" #include "options.h" /** Aliases. diff --git a/pkg/noun/v2/hashtable.c b/pkg/noun/v2/hashtable.c index 6963d07fde..a4f0291bd1 100644 --- a/pkg/noun/v2/hashtable.c +++ b/pkg/noun/v2/hashtable.c @@ -1,12 +1,12 @@ /// @file -#include "pkg/noun/hashtable.h" -#include "pkg/noun/v1/hashtable.h" -#include "pkg/noun/v2/hashtable.h" +#include "../hashtable.h" +#include "v1/hashtable.h" +#include "v2/hashtable.h" -#include "pkg/noun/allocate.h" -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v2/allocate.h" +#include "../allocate.h" +#include "v1/allocate.h" +#include "v2/allocate.h" /* _ch_v2_popcount(): number of bits set in word. A standard intrinsic. ** NB: copy of _ch_v2_popcount in pkg/noun/hashtable.c diff --git a/pkg/noun/v2/hashtable.h b/pkg/noun/v2/hashtable.h index 09025fc19f..bc95c2a469 100644 --- a/pkg/noun/v2/hashtable.h +++ b/pkg/noun/v2/hashtable.h @@ -13,7 +13,7 @@ #define u3h_v2_walk u3h_walk #define u3h_v2_walk_with u3h_walk_with -#include "pkg/noun/hashtable.h" +#include "../hashtable.h" #include "c3.h" #include "types.h" diff --git a/pkg/noun/v2/jets.c b/pkg/noun/v2/jets.c index 27a5347ad3..4d5fa0f677 100644 --- a/pkg/noun/v2/jets.c +++ b/pkg/noun/v2/jets.c @@ -1,16 +1,16 @@ /// @file -#include "pkg/noun/vortex.h" +#include "../vortex.h" -#include "pkg/noun/jets.h" -#include "pkg/noun/v2/jets.h" +#include "../jets.h" +#include "v2/jets.h" -#include "pkg/noun/v2/allocate.h" -#include "pkg/noun/v2/hashtable.h" -#include "pkg/noun/v2/vortex.h" +#include "v2/allocate.h" +#include "v2/hashtable.h" +#include "v2/vortex.h" -#include "pkg/noun/v3/hashtable.h" -#include "pkg/noun/v3/jets.h" +#include "v3/hashtable.h" +#include "v3/jets.h" /* u3j_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v2/jets.h b/pkg/noun/v2/jets.h index 3feed48feb..33ac088d8f 100644 --- a/pkg/noun/v2/jets.h +++ b/pkg/noun/v2/jets.h @@ -3,8 +3,8 @@ #ifndef U3_JETS_V2_H #define U3_JETS_V2_H -#include "pkg/noun/allocate.h" -#include "pkg/noun/jets.h" +#include "../allocate.h" +#include "../jets.h" /** Aliases. diff --git a/pkg/noun/v2/manage.c b/pkg/noun/v2/manage.c index 76d5b57b98..16981d21cc 100644 --- a/pkg/noun/v2/manage.c +++ b/pkg/noun/v2/manage.c @@ -1,16 +1,16 @@ /// @file -#include "pkg/noun/v2/manage.h" - -#include "pkg/noun/v1/allocate.h" -#include "pkg/noun/v2/allocate.h" -#include "pkg/noun/v2/hashtable.h" -#include "pkg/noun/v2/jets.h" -#include "pkg/noun/v2/nock.h" -#include "pkg/noun/v2/options.h" -#include "pkg/noun/vortex.h" -#include "pkg/noun/v1/vortex.h" -#include "pkg/noun/v2/vortex.h" +#include "v2/manage.h" + +#include "v1/allocate.h" +#include "v2/allocate.h" +#include "v2/hashtable.h" +#include "v2/jets.h" +#include "v2/nock.h" +#include "v2/options.h" +#include "../vortex.h" +#include "v1/vortex.h" +#include "v2/vortex.h" /* _cm_pack_rewrite(): trace through arena, rewriting pointers. */ diff --git a/pkg/noun/v2/nock.c b/pkg/noun/v2/nock.c index dd70cc732e..e42221a026 100644 --- a/pkg/noun/v2/nock.c +++ b/pkg/noun/v2/nock.c @@ -1,14 +1,14 @@ /// @file -#include "pkg/noun/v2/nock.h" +#include "v2/nock.h" -#include "pkg/noun/vortex.h" +#include "../vortex.h" -#include "pkg/noun/v2/allocate.h" -#include "pkg/noun/v2/hashtable.h" -#include "pkg/noun/v2/vortex.h" +#include "v2/allocate.h" +#include "v2/hashtable.h" +#include "v2/vortex.h" -#include "pkg/noun/v3/hashtable.h" +#include "v3/hashtable.h" /* u3n_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory. */ diff --git a/pkg/noun/v2/nock.h b/pkg/noun/v2/nock.h index dcc93d2143..efb91219be 100644 --- a/pkg/noun/v2/nock.h +++ b/pkg/noun/v2/nock.h @@ -3,9 +3,9 @@ #ifndef U3_NOCK_V2_H #define U3_NOCK_V2_H -#include "pkg/noun/v3/nock.h" +#include "v3/nock.h" -#include "pkg/noun/v2/jets.h" +#include "v2/jets.h" #include "types.h" diff --git a/pkg/noun/v2/options.h b/pkg/noun/v2/options.h index 4af573f20d..079f766fad 100644 --- a/pkg/noun/v2/options.h +++ b/pkg/noun/v2/options.h @@ -3,7 +3,7 @@ #ifndef U3_OPTIONS_V2_H #define U3_OPTIONS_V2_H -#include "pkg/noun/options.h" +#include "../options.h" /** Globals. **/ diff --git a/pkg/noun/v2/vortex.c b/pkg/noun/v2/vortex.c index 4656ed2461..9b21d5cf01 100644 --- a/pkg/noun/v2/vortex.c +++ b/pkg/noun/v2/vortex.c @@ -1,9 +1,9 @@ /// @file -#include "pkg/noun/vortex.h" -#include "pkg/noun/v2/vortex.h" +#include "../vortex.h" +#include "v2/vortex.h" -#include "pkg/noun/v2/allocate.h" +#include "v2/allocate.h" u3v_v2_home* u3v_v2_Home; diff --git a/pkg/noun/v2/vortex.h b/pkg/noun/v2/vortex.h index d15910fb33..9e04832411 100644 --- a/pkg/noun/v2/vortex.h +++ b/pkg/noun/v2/vortex.h @@ -3,10 +3,10 @@ #ifndef U3_VORTEX_V2_H #define U3_VORTEX_V2_H -#include "pkg/noun/vortex.h" +#include "../vortex.h" -#include "pkg/noun/v2/allocate.h" -#include "pkg/noun/version.h" +#include "v2/allocate.h" +#include "../version.h" /** Aliases. **/ diff --git a/pkg/noun/v3/allocate.h b/pkg/noun/v3/allocate.h index bacc79e174..a47cc1f459 100644 --- a/pkg/noun/v3/allocate.h +++ b/pkg/noun/v3/allocate.h @@ -1,9 +1,9 @@ #ifndef U3_ALLOCATE_V3_H #define U3_ALLOCATE_V3_H -#include "pkg/noun/allocate.h" +#include "../allocate.h" -#include "pkg/noun/v3/manage.h" +#include "v3/manage.h" #include "options.h" /** Aliases. diff --git a/pkg/noun/v3/hashtable.c b/pkg/noun/v3/hashtable.c index b17d7b6e78..3044758e20 100644 --- a/pkg/noun/v3/hashtable.c +++ b/pkg/noun/v3/hashtable.c @@ -1,12 +1,12 @@ /// @file -#include "pkg/noun/v3/hashtable.h" +#include "v3/hashtable.h" -#include "pkg/noun/allocate.h" -#include "pkg/noun/vortex.h" +#include "../allocate.h" +#include "../vortex.h" -#include "pkg/noun/v3/allocate.h" -#include "pkg/noun/v3/vortex.h" +#include "v3/allocate.h" +#include "v3/vortex.h" /* u3h_v3_new_cache(): create hashtable with bounded size. */ diff --git a/pkg/noun/v3/hashtable.h b/pkg/noun/v3/hashtable.h index 14e0e47753..1d00a86296 100644 --- a/pkg/noun/v3/hashtable.h +++ b/pkg/noun/v3/hashtable.h @@ -6,7 +6,7 @@ #define u3h_v3_root u3h_root #define u3h_v3_walk u3h_walk -#include "pkg/noun/hashtable.h" +#include "../hashtable.h" /** Functions. **/ diff --git a/pkg/noun/v3/jets.h b/pkg/noun/v3/jets.h index a0fe54f9d7..089ff647b3 100644 --- a/pkg/noun/v3/jets.h +++ b/pkg/noun/v3/jets.h @@ -3,7 +3,7 @@ #ifndef U3_JETS_V3_H #define U3_JETS_V3_H -#include "pkg/noun/jets.h" +#include "../jets.h" /** Aliases. **/ diff --git a/pkg/noun/v3/manage.c b/pkg/noun/v3/manage.c index 3750262493..0cde37a215 100644 --- a/pkg/noun/v3/manage.c +++ b/pkg/noun/v3/manage.c @@ -1,16 +1,16 @@ /// @file -#include "pkg/noun/v3/manage.h" +#include "v3/manage.h" -#include "pkg/noun/v2/jets.h" -#include "pkg/noun/v2/nock.h" -#include "pkg/noun/v2/vortex.h" +#include "v2/jets.h" +#include "v2/nock.h" +#include "v2/vortex.h" -#include "pkg/noun/v3/allocate.h" -#include "pkg/noun/v3/hashtable.h" -#include "pkg/noun/version.h" -#include "pkg/noun/v3/vortex.h" -#include +#include "v3/allocate.h" +#include "v3/hashtable.h" +#include "../version.h" +#include "v3/vortex.h" +#include "v2/allocate.h" /* u3m_v3_migrate: perform loom migration if necessary. */ diff --git a/pkg/noun/v3/nock.h b/pkg/noun/v3/nock.h index a7b208ba99..ee76eb9ce4 100644 --- a/pkg/noun/v3/nock.h +++ b/pkg/noun/v3/nock.h @@ -3,7 +3,7 @@ #ifndef U3_NOCK_V3_H #define U3_NOCK_V3_H -#include "pkg/noun/nock.h" +#include "../nock.h" #include "types.h" diff --git a/pkg/noun/v3/vortex.h b/pkg/noun/v3/vortex.h index d47ac19654..9a4c9ef071 100644 --- a/pkg/noun/v3/vortex.h +++ b/pkg/noun/v3/vortex.h @@ -3,10 +3,10 @@ #ifndef U3_VORTEX_V3_H #define U3_VORTEX_V3_H -#include "pkg/noun/vortex.h" +#include "../vortex.h" -#include "pkg/noun/v3/allocate.h" -#include "pkg/noun/version.h" +#include "v3/allocate.h" +#include "../version.h" /** Aliases. **/ From a9c148441c999b9c6f917990f61c04de54efad01 Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 18:04:54 +0300 Subject: [PATCH 7/8] noun: fix pkg includes and platform specific header includes --- build.zig | 12 ++++-------- pkg/noun/events.h | 2 +- pkg/noun/hashtable.h | 2 +- pkg/noun/imprison.h | 2 +- pkg/noun/jets.h | 2 +- pkg/noun/jets/e/secp.c | 2 +- pkg/noun/jets/tree.c | 2 +- pkg/noun/manage.c | 2 +- pkg/noun/manage.h | 2 +- pkg/noun/nock.h | 2 +- pkg/noun/options.h | 2 +- pkg/noun/retrieve.h | 2 +- pkg/noun/serial.c | 2 +- pkg/noun/serial.h | 2 +- pkg/noun/types.h | 2 +- pkg/noun/urth.c | 2 +- pkg/noun/urth.h | 2 +- pkg/noun/v2/hashtable.h | 2 +- pkg/noun/vortex.h | 2 +- pkg/noun/xtract.h | 2 +- pkg/noun/zave.h | 2 +- 21 files changed, 24 insertions(+), 28 deletions(-) diff --git a/build.zig b/build.zig index a0e1b26f82..eccaa86aa2 100644 --- a/build.zig +++ b/build.zig @@ -712,15 +712,11 @@ fn build_single( .include_extensions = &.{".h"}, }); - pkg_noun.installHeadersDirectory(b.path(switch (t.os.tag) { - .macos => "pkg/noun/platform/darwin", - .linux => "pkg/noun/platform/linux", + pkg_noun.installHeader(b.path(switch (t.os.tag) { + .macos => "pkg/noun/platform/darwin/rsignal.h", + .linux => "pkg/noun/platform/linux/rsignal.h", else => "", - }), "", .{}); - - pkg_noun.installHeadersDirectory(b.path("pkg/noun/jets"), "", .{ - .include_extensions = &.{".h"}, - }); + }), "platform/rsignal.h"); // b.installArtifact(pkg_noun); diff --git a/pkg/noun/events.h b/pkg/noun/events.h index 76501db6df..ff7b7de612 100644 --- a/pkg/noun/events.h +++ b/pkg/noun/events.h @@ -3,7 +3,7 @@ #ifndef U3_EVENTS_H #define U3_EVENTS_H -#include "c3.h" +#include "c3/c3.h" #include "allocate.h" #include "version.h" diff --git a/pkg/noun/hashtable.h b/pkg/noun/hashtable.h index 217546c9c1..50daba911f 100644 --- a/pkg/noun/hashtable.h +++ b/pkg/noun/hashtable.h @@ -1,7 +1,7 @@ #ifndef U3_HASHTABLE_H #define U3_HASHTABLE_H -#include "c3.h" +#include "c3/c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/imprison.h b/pkg/noun/imprison.h index be8b6040e0..6d2dcb175d 100644 --- a/pkg/noun/imprison.h +++ b/pkg/noun/imprison.h @@ -4,7 +4,7 @@ #define U3_IMPRISON_H #include "allocate.h" -#include "c3.h" +#include "c3/c3.h" #include "gmp.h" #include "types.h" diff --git a/pkg/noun/jets.h b/pkg/noun/jets.h index cf253a695c..bfaa68aeaa 100644 --- a/pkg/noun/jets.h +++ b/pkg/noun/jets.h @@ -4,7 +4,7 @@ #define U3_JETS_H #include "allocate.h" -#include "c3.h" +#include "c3/c3.h" #include "types.h" /** Noun semantics. diff --git a/pkg/noun/jets/e/secp.c b/pkg/noun/jets/e/secp.c index f5e3a2aa94..fa0fbd20c4 100644 --- a/pkg/noun/jets/e/secp.c +++ b/pkg/noun/jets/e/secp.c @@ -5,7 +5,7 @@ #include "noun.h" #include "urcrypt.h" -#include +#include "ent/ent.h" static urcrypt_secp_context* sec_u; diff --git a/pkg/noun/jets/tree.c b/pkg/noun/jets/tree.c index bf06268b5b..cd1e05aec1 100644 --- a/pkg/noun/jets/tree.c +++ b/pkg/noun/jets/tree.c @@ -17,7 +17,7 @@ ``` */ -#include "c3.h" +#include "c3/c3.h" #include "jets.h" #include "jets/w.h" diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c index 69db1c4678..4d85303ac0 100644 --- a/pkg/noun/manage.c +++ b/pkg/noun/manage.c @@ -28,7 +28,7 @@ #include "nock.h" #include "openssl/crypto.h" #include "options.h" -#include "platform/rsignal.h" +#include "rsignal.h" #include "retrieve.h" #include "trace.h" #include "urcrypt.h" diff --git a/pkg/noun/manage.h b/pkg/noun/manage.h index 14f9cc503d..46a8bcb61e 100644 --- a/pkg/noun/manage.h +++ b/pkg/noun/manage.h @@ -6,7 +6,7 @@ #include "v1/manage.h" #include "v2/manage.h" -#include "c3.h" +#include "c3/c3.h" #include "types.h" #include "version.h" diff --git a/pkg/noun/nock.h b/pkg/noun/nock.h index 2ee4ccfec8..3f1830a301 100644 --- a/pkg/noun/nock.h +++ b/pkg/noun/nock.h @@ -5,7 +5,7 @@ #include -#include "c3.h" +#include "c3/c3.h" #include "jets.h" #include "types.h" #include "zave.h" diff --git a/pkg/noun/options.h b/pkg/noun/options.h index 29ca6ce9d9..2f218add57 100644 --- a/pkg/noun/options.h +++ b/pkg/noun/options.h @@ -3,7 +3,7 @@ #ifndef U3_OPTIONS_H #define U3_OPTIONS_H -#include "c3.h" +#include "c3/c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/retrieve.h b/pkg/noun/retrieve.h index 7423ad9f49..0e0554b24b 100644 --- a/pkg/noun/retrieve.h +++ b/pkg/noun/retrieve.h @@ -3,7 +3,7 @@ #ifndef U3_RETRIEVE_H #define U3_RETRIEVE_H -#include "c3.h" +#include "c3/c3.h" #include "allocate.h" #include "error.h" #include "gmp.h" diff --git a/pkg/noun/serial.c b/pkg/noun/serial.c index 84302ae8a2..70ced99a68 100644 --- a/pkg/noun/serial.c +++ b/pkg/noun/serial.c @@ -11,7 +11,7 @@ #include "jets/q.h" #include "retrieve.h" #include "serial.h" -#include "ur.h" +#include "ur/ur.h" #include "vortex.h" #include "xtract.h" diff --git a/pkg/noun/serial.h b/pkg/noun/serial.h index 608d702de7..d7dd5a8eaa 100644 --- a/pkg/noun/serial.h +++ b/pkg/noun/serial.h @@ -3,7 +3,7 @@ #ifndef U3_SERIAL_H #define U3_SERIAL_H -#include "c3.h" +#include "c3/c3.h" #include "imprison.h" #include "types.h" /* constants diff --git a/pkg/noun/types.h b/pkg/noun/types.h index c921900f07..6819eb6045 100644 --- a/pkg/noun/types.h +++ b/pkg/noun/types.h @@ -5,7 +5,7 @@ #ifndef U3_TYPES_H #define U3_TYPES_H -#include "c3.h" +#include "c3/c3.h" /// Sentinel value for u3_noun types that aren't actually nouns. #define u3_none (u3_noun)0xffffffff diff --git a/pkg/noun/urth.c b/pkg/noun/urth.c index 701d235637..6eb6f8fcc3 100644 --- a/pkg/noun/urth.c +++ b/pkg/noun/urth.c @@ -14,7 +14,7 @@ #include "manage.h" #include "retrieve.h" #include "serial.h" -#include "ur.h" +#include "ur/ur.h" #include "vortex.h" /* _cu_atom_to_ref(): allocate indirect atom off-loom. diff --git a/pkg/noun/urth.h b/pkg/noun/urth.h index 0dc2aa8168..e2ab3e6f44 100644 --- a/pkg/noun/urth.h +++ b/pkg/noun/urth.h @@ -3,7 +3,7 @@ #ifndef U3_URTH_H #define U3_URTH_H -#include "c3.h" +#include "c3/c3.h" /** Functions. **/ diff --git a/pkg/noun/v2/hashtable.h b/pkg/noun/v2/hashtable.h index bc95c2a469..22786408f1 100644 --- a/pkg/noun/v2/hashtable.h +++ b/pkg/noun/v2/hashtable.h @@ -15,7 +15,7 @@ #include "../hashtable.h" -#include "c3.h" +#include "c3/c3.h" #include "types.h" /** Data structures. diff --git a/pkg/noun/vortex.h b/pkg/noun/vortex.h index 057be859d4..9cc56474e0 100644 --- a/pkg/noun/vortex.h +++ b/pkg/noun/vortex.h @@ -4,7 +4,7 @@ #define U3_VORTEX_H #include "allocate.h" -#include "c3.h" +#include "c3/c3.h" #include "imprison.h" #include "version.h" diff --git a/pkg/noun/xtract.h b/pkg/noun/xtract.h index 343690a8f2..8f9da2e26d 100644 --- a/pkg/noun/xtract.h +++ b/pkg/noun/xtract.h @@ -3,7 +3,7 @@ #ifndef U3_XTRACT_H #define U3_XTRACT_H -#include "c3.h" +#include "c3/c3.h" #include "types.h" #include "allocate.h" #include "manage.h" diff --git a/pkg/noun/zave.h b/pkg/noun/zave.h index feff83f664..3c9d74da0b 100644 --- a/pkg/noun/zave.h +++ b/pkg/noun/zave.h @@ -3,7 +3,7 @@ #ifndef U3_ZAVE_H #define U3_ZAVE_H -#include "c3.h" +#include "c3/c3.h" #include "types.h" /** Memoization. From bb8bdd83545a186961be8c707bc21a3ab4ff6249 Mon Sep 17 00:00:00 2001 From: Santeri Hannula Date: Thu, 3 Oct 2024 18:07:59 +0300 Subject: [PATCH 8/8] vere: fix pkg includes --- pkg/vere/benchmarks.c | 2 +- pkg/vere/boot_tests.c | 2 +- pkg/vere/db/lmdb.c | 2 +- pkg/vere/db/lmdb.h | 2 +- pkg/vere/io/ames.c | 4 ++-- pkg/vere/king.c | 2 +- pkg/vere/lord.c | 2 +- pkg/vere/main.c | 2 +- pkg/vere/mars.c | 4 ++-- pkg/vere/noun_tests.c | 2 +- pkg/vere/pier.c | 2 +- pkg/vere/platform/darwin/ptty.c | 2 +- pkg/vere/platform/linux/ptty.c | 2 +- pkg/vere/serf.c | 2 +- pkg/vere/vere.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkg/vere/benchmarks.c b/pkg/vere/benchmarks.c index a9215cf864..9898217c5e 100644 --- a/pkg/vere/benchmarks.c +++ b/pkg/vere/benchmarks.c @@ -2,7 +2,7 @@ #include "noun.h" #include "jets/q.h" -#include "ur.h" +#include "ur/ur.h" #include "vere.h" /* _setup(): prepare for tests. diff --git a/pkg/vere/boot_tests.c b/pkg/vere/boot_tests.c index 3276834d69..d9728d88cf 100644 --- a/pkg/vere/boot_tests.c +++ b/pkg/vere/boot_tests.c @@ -2,7 +2,7 @@ #include "ivory.h" #include "noun.h" -#include "ur.h" +#include "ur/ur.h" #include "vere.h" /* _setup(): prepare for tests. diff --git a/pkg/vere/db/lmdb.c b/pkg/vere/db/lmdb.c index a31bbd1de6..61158e3d54 100644 --- a/pkg/vere/db/lmdb.c +++ b/pkg/vere/db/lmdb.c @@ -4,7 +4,7 @@ #include -#include "c3.h" +#include "c3/c3.h" #include "noun.h" /* mdb_logerror(): writes an error message and lmdb error code to f. diff --git a/pkg/vere/db/lmdb.h b/pkg/vere/db/lmdb.h index 43c6b433ff..e630cf4dd2 100644 --- a/pkg/vere/db/lmdb.h +++ b/pkg/vere/db/lmdb.h @@ -3,7 +3,7 @@ #ifndef U3_VERE_DB_LMDB_H #define U3_VERE_DB_LMDB_H -#include "c3.h" +#include "c3/c3.h" #include "lmdb/lmdb.h" /* lmdb api wrapper diff --git a/pkg/vere/io/ames.c b/pkg/vere/io/ames.c index 165b57fd18..6d22d2eca1 100644 --- a/pkg/vere/io/ames.c +++ b/pkg/vere/io/ames.c @@ -5,12 +5,12 @@ #include "io/ames/stun.h" #include "noun.h" -#include "ur.h" +#include "ur/ur.h" #include "zlib.h" #include "natpmp.h" -#include +#include "ent/ent.h" #include diff --git a/pkg/vere/king.c b/pkg/vere/king.c index 0cf555a3d1..8d5402cb30 100644 --- a/pkg/vere/king.c +++ b/pkg/vere/king.c @@ -8,7 +8,7 @@ #include "ivory.h" #include "noun.h" #include "pace.h" -#include "ur.h" +#include "ur/ur.h" #include "uv.h" #include "version.h" diff --git a/pkg/vere/lord.c b/pkg/vere/lord.c index ded3bc824d..b7c03dfe6f 100644 --- a/pkg/vere/lord.c +++ b/pkg/vere/lord.c @@ -3,7 +3,7 @@ #include "vere.h" #include "noun.h" -#include "ur.h" +#include "ur/ur.h" #undef LORD_TRACE_JAM #undef LORD_TRACE_CUE diff --git a/pkg/vere/main.c b/pkg/vere/main.c index f78031c70e..1b09ccce3f 100644 --- a/pkg/vere/main.c +++ b/pkg/vere/main.c @@ -5,7 +5,7 @@ #include "noun.h" #include "events.h" // XX remove, see full replay in _cw_play() #include "ivory.h" -#include "ur.h" +#include "ur/ur.h" #include "platform/rsignal.h" #include "vere.h" #include "sigsegv.h" diff --git a/pkg/vere/mars.c b/pkg/vere/mars.c index db9056a0ab..6d4af05420 100644 --- a/pkg/vere/mars.c +++ b/pkg/vere/mars.c @@ -2,12 +2,12 @@ ** ** the main loop of a mars process. */ -#include "c3.h" +#include "c3/c3.h" #include "noun.h" #include "types.h" #include "vere.h" #include "ivory.h" -#include "ur.h" +#include "ur/ur.h" #include "db/lmdb.h" #include #include diff --git a/pkg/vere/noun_tests.c b/pkg/vere/noun_tests.c index 037cd04c14..f26444fc01 100644 --- a/pkg/vere/noun_tests.c +++ b/pkg/vere/noun_tests.c @@ -2,7 +2,7 @@ #include "noun.h" #include "ivory.h" -#include "ur.h" +#include "ur/ur.h" #include "vere.h" #define TRUE 1 diff --git a/pkg/vere/pier.c b/pkg/vere/pier.c index 23d96bd377..1e8c25b110 100644 --- a/pkg/vere/pier.c +++ b/pkg/vere/pier.c @@ -1,7 +1,7 @@ /// @file #include "db/lmdb.h" -#include "ent.h" +#include "ent/ent.h" #include "noun.h" #include "pace.h" #include "vere.h" diff --git a/pkg/vere/platform/darwin/ptty.c b/pkg/vere/platform/darwin/ptty.c index 3f66ee18f8..a1ec334507 100644 --- a/pkg/vere/platform/darwin/ptty.c +++ b/pkg/vere/platform/darwin/ptty.c @@ -1,6 +1,6 @@ /// @file -#include "c3.h" +#include "c3/c3.h" #include "noun.h" #include "vere.h" #include diff --git a/pkg/vere/platform/linux/ptty.c b/pkg/vere/platform/linux/ptty.c index 3f66ee18f8..a1ec334507 100644 --- a/pkg/vere/platform/linux/ptty.c +++ b/pkg/vere/platform/linux/ptty.c @@ -1,6 +1,6 @@ /// @file -#include "c3.h" +#include "c3/c3.h" #include "noun.h" #include "vere.h" #include diff --git a/pkg/vere/serf.c b/pkg/vere/serf.c index cec8bece55..78ca9708c2 100644 --- a/pkg/vere/serf.c +++ b/pkg/vere/serf.c @@ -4,7 +4,7 @@ #include "vere.h" #include "ivory.h" -#include "ur.h" +#include "ur/ur.h" /* |% diff --git a/pkg/vere/vere.h b/pkg/vere/vere.h index dab95c5080..71fd37fe89 100644 --- a/pkg/vere/vere.h +++ b/pkg/vere/vere.h @@ -3,7 +3,7 @@ #ifndef U3_VERE_H #define U3_VERE_H -#include "c3.h" +#include "c3/c3.h" #include "db/lmdb.h" #include "noun.h" #include "serf.h"