From f3aa87c436e24fc535e8df8e596264a1183be2e2 Mon Sep 17 00:00:00 2001 From: Itamar Date: Mon, 16 Aug 2021 23:06:49 +0300 Subject: [PATCH] Kernel: Make makedev()/minor()/major() static This was originally done in 7274037 and for some reason reverted in 740140a. This avoids "multiple definitions" link errors and fixes the libuv port. --- Kernel/API/POSIX/sys/types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/API/POSIX/sys/types.h b/Kernel/API/POSIX/sys/types.h index 3029e0a101..2ff467b9c0 100644 --- a/Kernel/API/POSIX/sys/types.h +++ b/Kernel/API/POSIX/sys/types.h @@ -92,9 +92,9 @@ typedef struct __pthread_condattr_t { int clockid; // clockid_t } pthread_condattr_t; -inline dev_t makedev(unsigned major, unsigned minor) { return (minor & 0xffu) | (major << 8u) | ((minor & ~0xffu) << 12u); } -inline unsigned int major(dev_t dev) { return (dev & 0xfff00u) >> 8u; } -inline unsigned int minor(dev_t dev) { return (dev & 0xffu) | ((dev >> 12u) & 0xfff00u); } +static inline dev_t makedev(unsigned major, unsigned minor) { return (minor & 0xffu) | (major << 8u) | ((minor & ~0xffu) << 12u); } +static inline unsigned int major(dev_t dev) { return (dev & 0xfff00u) >> 8u; } +static inline unsigned int minor(dev_t dev) { return (dev & 0xffu) | ((dev >> 12u) & 0xfff00u); } #ifdef __cplusplus }