From 06e80ec522741ecf4fdf6ba6582841fd1f2e5080 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 17 Sep 2013 12:29:52 -0700 Subject: [PATCH] Sophia fixes for relative includes --- src/sophia/db/cat.c | 2 +- src/sophia/db/crc.c | 2 +- src/sophia/db/cursor.c | 2 +- src/sophia/db/e.c | 2 +- src/sophia/db/file.c | 2 +- src/sophia/db/gc.c | 2 +- src/sophia/db/i.c | 2 +- src/sophia/db/merge.c | 2 +- src/sophia/db/recover.c | 4 ++-- src/sophia/db/rep.c | 2 +- src/sophia/db/sp.c | 2 +- src/sophia/db/sp.h | 40 ++++++++++++++++++++-------------------- src/sophia/db/util.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/sophia/db/cat.c b/src/sophia/db/cat.c index fbe9c430d..76c7189fb 100644 --- a/src/sophia/db/cat.c +++ b/src/sophia/db/cat.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" static inline int sp_catensure(spcat *c) { if ((c->count + 1) < c->top) diff --git a/src/sophia/db/crc.c b/src/sophia/db/crc.c index eb5c6d511..fb21e0ac4 100644 --- a/src/sophia/db/crc.c +++ b/src/sophia/db/crc.c @@ -14,7 +14,7 @@ * This software program is licensed subject to the BSD License, * available at http://www.opensource.org/licenses/bsd-license.html */ -#include +#include "sp.h" static const uint32_t crc_tableil8_o32[256] = { diff --git a/src/sophia/db/cursor.c b/src/sophia/db/cursor.c index 9718771ad..71bbd4a36 100644 --- a/src/sophia/db/cursor.c +++ b/src/sophia/db/cursor.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" static inline void sp_pageopen(spc *c, uint32_t page) diff --git a/src/sophia/db/e.c b/src/sophia/db/e.c index ca3db7e9c..40e8211cf 100644 --- a/src/sophia/db/e.c +++ b/src/sophia/db/e.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" void sp_ve(spe *e, int type, va_list args) { diff --git a/src/sophia/db/file.c b/src/sophia/db/file.c index 3a7edd25e..f9737f915 100644 --- a/src/sophia/db/file.c +++ b/src/sophia/db/file.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" #include #include #include diff --git a/src/sophia/db/gc.c b/src/sophia/db/gc.c index e6f989f84..017b40e22 100644 --- a/src/sophia/db/gc.c +++ b/src/sophia/db/gc.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" int sp_gc(sp *s, spepoch *x) { diff --git a/src/sophia/db/i.c b/src/sophia/db/i.c index 6a281c898..f21631219 100644 --- a/src/sophia/db/i.c +++ b/src/sophia/db/i.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" static inline int sp_iensure(spi *i) { if (splikely((i->icount + 1) < i->itop)) diff --git a/src/sophia/db/merge.c b/src/sophia/db/merge.c index ac5ec2344..bb45eb6c9 100644 --- a/src/sophia/db/merge.c +++ b/src/sophia/db/merge.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" typedef struct { uint32_t count; diff --git a/src/sophia/db/recover.c b/src/sophia/db/recover.c index e6b93247c..a4d8052b0 100644 --- a/src/sophia/db/recover.c +++ b/src/sophia/db/recover.c @@ -7,8 +7,8 @@ * BSD License */ -#include -#include +#include "sp.h" +#include "track.h" #include #include #include diff --git a/src/sophia/db/rep.c b/src/sophia/db/rep.c index 264c65fa0..de74b072b 100644 --- a/src/sophia/db/rep.c +++ b/src/sophia/db/rep.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" void sp_repinit(sprep *r, spa *a) { sp_listinit(&r->l); diff --git a/src/sophia/db/sp.c b/src/sophia/db/sp.c index e7f5ee604..71da7b48f 100644 --- a/src/sophia/db/sp.c +++ b/src/sophia/db/sp.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" static inline int sphot cmpstd(char *a, size_t asz, char *b, size_t bsz, void *arg spunused) { diff --git a/src/sophia/db/sp.h b/src/sophia/db/sp.h index 06a1a4b4c..feadd2e41 100644 --- a/src/sophia/db/sp.h +++ b/src/sophia/db/sp.h @@ -25,26 +25,26 @@ #include #include -#include +#include "sophia.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "macro.h" +#include "crc.h" +#include "lock.h" +#include "list.h" +#include "e.h" +#include "a.h" +#include "meta.h" +#include "file.h" +#include "ref.h" +#include "i.h" +#include "rep.h" +#include "cat.h" +#include "task.h" +#include "core.h" +#include "util.h" +#include "recover.h" +#include "merge.h" +#include "gc.h" +#include "cursor.h" #endif diff --git a/src/sophia/db/util.c b/src/sophia/db/util.c index 471490f07..a7f8b568d 100644 --- a/src/sophia/db/util.c +++ b/src/sophia/db/util.c @@ -7,7 +7,7 @@ * BSD License */ -#include +#include "sp.h" char *sp_memdup(sp *s, void *src, size_t size) {