From f47c92bd2e8f1b3842060c8a46387c825b196220 Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Fri, 18 Mar 2022 03:21:59 -0700 Subject: [PATCH] Kernel: Mark `serenity_dev_` functions as static This avoids multiple definition errors when linking software which may utilize these functions from different compilation units. --- Kernel/API/Device.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/API/Device.h b/Kernel/API/Device.h index 05cba987e4..980c9d7390 100644 --- a/Kernel/API/Device.h +++ b/Kernel/API/Device.h @@ -12,17 +12,17 @@ __BEGIN_DECLS -ALWAYS_INLINE dev_t serenity_dev_makedev(unsigned major, unsigned minor) +static ALWAYS_INLINE dev_t serenity_dev_makedev(unsigned major, unsigned minor) { return (minor & 0xffu) | (major << 8u) | ((minor & ~0xffu) << 12u); } -ALWAYS_INLINE unsigned int serenity_dev_major(dev_t dev) +static ALWAYS_INLINE unsigned int serenity_dev_major(dev_t dev) { return (dev & 0xfff00u) >> 8u; } -ALWAYS_INLINE unsigned int serenity_dev_minor(dev_t dev) +static ALWAYS_INLINE unsigned int serenity_dev_minor(dev_t dev) { return (dev & 0xffu) | ((dev >> 12u) & 0xfff00u); }