fix shifts possibly larger than type in major() macro

[musl] / include / sys / sysmacros.h

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index 2285271..07a3ef1 100644 (file)
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -1,8 +1,15 @@
 #ifndef _SYS_SYSMACROS_H
 #define _SYS_SYSMACROS_H
 
-#define major(x) ((unsigned)((x) >> 8) & 0xff)
-#define minor(x) ((unsigned)(x) & 0xff)
-#define makedev(x,y) (((x)<<8)|((y)&0xff))
+#define major(x) \
+       ((unsigned)( (((x)>>31>>1) & 0xfffff000) | (((x)>>8) & 0x00000fff) ))
+#define minor(x) \
+       ((unsigned)( (((x)>>12) & 0xffffff00) | ((x) & 0x000000ff) ))
+
+#define makedev(x,y) ( \
+        (((x)&0xfffff000ULL) << 32) | \
+       (((x)&0x00000fffULL) << 8) | \
+        (((y)&0xffffff00ULL) << 12) | \
+       (((y)&0x000000ffULL)) )
 
 #endif