From f47b77faaebbeeddbbdc3c58489ba7b1001441a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C5=8Dshin?= Date: Fri, 4 Feb 2022 13:04:18 -0600 Subject: [PATCH] vere: mv ivory header out of ur --- pkg/urbit/include/ur/ur.h | 1 - pkg/urbit/include/{ur => vere}/ivory.h | 0 pkg/urbit/tests/boot_tests.c | 3 ++- pkg/urbit/{ur => vere}/ivory.c | 2 +- pkg/urbit/vere/king.c | 3 ++- 5 files changed, 5 insertions(+), 4 deletions(-) rename pkg/urbit/include/{ur => vere}/ivory.h (100%) rename pkg/urbit/{ur => vere}/ivory.c (51%) diff --git a/pkg/urbit/include/ur/ur.h b/pkg/urbit/include/ur/ur.h index 59af58490a..5665a3cc42 100644 --- a/pkg/urbit/include/ur/ur.h +++ b/pkg/urbit/include/ur/ur.h @@ -4,7 +4,6 @@ #include "ur/defs.h" #include "ur/bitstream.h" #include "ur/hashcons.h" -#include "ur/ivory.h" #include "ur/serial.h" #endif /* ifndef UR_H */ diff --git a/pkg/urbit/include/ur/ivory.h b/pkg/urbit/include/vere/ivory.h similarity index 100% rename from pkg/urbit/include/ur/ivory.h rename to pkg/urbit/include/vere/ivory.h diff --git a/pkg/urbit/tests/boot_tests.c b/pkg/urbit/tests/boot_tests.c index 8af17fd5e8..e353b04d54 100644 --- a/pkg/urbit/tests/boot_tests.c +++ b/pkg/urbit/tests/boot_tests.c @@ -1,6 +1,7 @@ #include "all.h" -#include "vere/vere.h" #include "ur/ur.h" +#include "vere/ivory.h" +#include "vere/vere.h" /* _setup(): prepare for tests. */ diff --git a/pkg/urbit/ur/ivory.c b/pkg/urbit/vere/ivory.c similarity index 51% rename from pkg/urbit/ur/ivory.c rename to pkg/urbit/vere/ivory.c index d67956fb98..370f8c4abc 100644 --- a/pkg/urbit/ur/ivory.c +++ b/pkg/urbit/vere/ivory.c @@ -1,3 +1,3 @@ -#include "ur/ivory.h" +#include "vere/ivory.h" #include "ivory_impl.h" diff --git a/pkg/urbit/vere/king.c b/pkg/urbit/vere/king.c index 584dd86351..417e9504a3 100644 --- a/pkg/urbit/vere/king.c +++ b/pkg/urbit/vere/king.c @@ -3,8 +3,9 @@ ** the main loop of the daemon process */ #include "all.h" -#include "vere/vere.h" #include "ur/ur.h" +#include "vere/ivory.h" +#include "vere/vere.h" #include #include