diff --git a/core/debug.cc b/core/debug.cc index 747f66bfa3c2d15de50d8666d7090ee502ae7b12..797ea3bb96e7c0a081f1c6b013ebcd21e629cd09 100644 --- a/core/debug.cc +++ b/core/debug.cc @@ -13,7 +13,7 @@ #include "drivers/console.hh" #include <osv/sched.hh> #include <osv/debug.hh> -#include "osv/debug.h" +#include <osv/debug.h> using namespace std; diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c index 10b23b90e55e9529aea3c556ad1066ccc9149161..3346a661ac36dc0a9c74d50f31abc1ebd3e8f8db 100644 --- a/drivers/ramdisk.c +++ b/drivers/ramdisk.c @@ -42,7 +42,7 @@ #include <osv/device.h> #include <osv/bio.h> -#include "debug.h" +#include <osv/debug.h> struct ramdisk_softc { char *addr; /* base address of image */ diff --git a/include/debug.h b/include/debug.h deleted file mode 100644 index 8aeec56a2e86fbbb4d19c155ad81af3dcb3f4a1f..0000000000000000000000000000000000000000 --- a/include/debug.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2013 Cloudius Systems, Ltd. - * - * This work is open source software, licensed under the terms of the - * BSD license as described in the LICENSE file in the top-level directory. - */ - -#ifndef DEBUGC_H -#define DEBUGC_H - -void debug(const char *msg); -void debugf(const char *, ...); - -#endif // DEBUGC_H diff --git a/include/osv/debug.h b/include/osv/debug.h index 6e4fe7df74e8169cc838b2d04d0f5dc8fe4c1710..df30fe4bb988a01aaf93863cb197d09653559e63 100644 --- a/include/osv/debug.h +++ b/include/osv/debug.h @@ -33,6 +33,7 @@ typedef enum logger_severity_e { __BEGIN_DECLS void debug(const char *msg); +void debugf(const char *, ...); void debug_write(const char *msg, size_t len); /* a lockless version that doesn't take any locks before printing, diff --git a/libc/exit/assert.c b/libc/exit/assert.c index c076a269c493f1a821e883dec0aec3f789a68b53..aef9d98217fdd7b56d5d6a84145df8ee02f826fc 100644 --- a/libc/exit/assert.c +++ b/libc/exit/assert.c @@ -1,5 +1,5 @@ #include <stdlib.h> -#include "osv/debug.h" +#include <osv/debug.h> void __assert_fail(const char *expr, const char *file, int line, const char *func) {