Module Name: src
Committed By: christos
Date: Thu Mar 17 00:48:50 UTC 2016
Modified Files:
src/sys/sys: types.h
Log Message:
Appease gcc-5 (devmajor_t and devminor_t are signed, so using them to
compose dev_t causes sign warnings).
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/types.h
diff -u src/sys/sys/types.h:1.95 src/sys/sys/types.h:1.96
--- src/sys/sys/types.h:1.95 Thu Aug 27 08:30:51 2015
+++ src/sys/sys/types.h Wed Mar 16 20:48:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.95 2015/08/27 12:30:51 pooka Exp $ */
+/* $NetBSD: types.h,v 1.96 2016/03/17 00:48:49 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -260,9 +260,9 @@ typedef int32_t __devmajor_t, __devminor
#define major(x) ((devmajor_t)(((uint32_t)(x) & 0x000fff00) >> 8))
#define minor(x) ((devminor_t)((((uint32_t)(x) & 0xfff00000) >> 12) | \
(((uint32_t)(x) & 0x000000ff) >> 0)))
-#define makedev(x,y) ((dev_t)((((x) << 8) & 0x000fff00) | \
- (((y) << 12) & 0xfff00000) | \
- (((y) << 0) & 0x000000ff)))
+#define makedev(x,y) ((dev_t)((((dev_t)(x) << 8) & 0x000fff00U) | \
+ (((dev_t)(y) << 12) & 0xfff00000U) | \
+ (((dev_t)(y) << 0) & 0x000000ffU)))
#endif
#ifdef _BSD_CLOCK_T_
