From 727403746f4cd5887e80d42242ecbcc8a7df2abd Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Fri, 9 Jul 2021 06:27:02 +0430 Subject: [PATCH] LibC: Make makedev()/minor()/major() static As we've opted to make these inline functions and not macros, let's at least make sure that the users don't *observe* multiple definitions of these functions. --- Userland/Libraries/LibC/sys/types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibC/sys/types.h b/Userland/Libraries/LibC/sys/types.h index 180179c33f..f1d39d02b4 100644 --- a/Userland/Libraries/LibC/sys/types.h +++ b/Userland/Libraries/LibC/sys/types.h @@ -89,8 +89,8 @@ typedef struct __pthread_condattr_t { int clockid; // clockid_t } pthread_condattr_t; -inline dev_t makedev(unsigned int major, unsigned int 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 int major, unsigned int 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); } __END_DECLS