X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsys%2Fsysmacros.h;h=07a3ef183cb63eaa3b4bd62671a8a0e010ca89da;hb=8f6ec7217f9d5446205b0b0dedb627b79e416363;hp=a2e2eaa247c2cd12621b5766805ceb959020f8a6;hpb=b0c088ee550634e07a6289a8ac98cb8009f81c66;p=musl

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index a2e2eaa2..07a3ef18 100644
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -1,8 +1,15 @@
-#ifndef _SYSMACROS_H
-#define _SYSMACROS_H
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H
 
-#define major(x) (((x) >> 8) & 0xff)
-#define minor(x) ((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