浏览代码

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.
Itamar 3 年之前
父节点
当前提交
f3aa87c436
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Kernel/API/POSIX/sys/types.h

+ 3 - 3
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
 }