svn commit: r340079 - head/sys/sys

[Ed Maste]

Author: emaste
Date: Fri Nov  2 20:48:29 2018
New Revision: 340079
URL: https://svnweb.freebsd.org/changeset/base/340079

Log:
  sys/types.h: avoid using terse macro _M
  
  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

Modified:
  head/sys/sys/types.h

Modified: head/sys/sys/types.h
==============================================================================
--- head/sys/sys/types.h	Fri Nov  2 19:23:50 2018	(r340078)
+++ head/sys/sys/types.h	Fri Nov  2 20:48:29 2018	(r340079)
@@ -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));
 }
 
 /*