d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/types.h: avoid using terse macro _M

Browse Source 
Although _M is reserved for use by the implemenation it is rather non-
descriptive and conflicted with a libc++ test.  Just rename to _Major
and _Minor to avoid conflicts.

Reviewed by:	dim
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D16734
This commit is contained in:
Ed Maste 2018-11-02 20:48:29 +00:00
parent 58ef854f8b
commit 09f4e462fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/sys/types.h
View File

@ -400,10 +400,10 @@ __minor(dev_t _d)
}
#define makedev(M, m) __makedev((M), (m))
static __inline dev_t
__makedev(int _M, int _m)
__makedev(int _Major, int _Minor)
{
return (((dev_t)(_M & 0xffffff00) << 32) | ((_M & 0xff) << 8) |
((dev_t)(_m & 0xff00) << 24) | (_m & 0xffff00ff));
return (((dev_t)(_Major & 0xffffff00) << 32) | ((_Major & 0xff) << 8) |
((dev_t)(_Minor & 0xff00) << 24) | (_Minor & 0xffff00ff));
}
/*