Module Name: src
Committed By: christos
Date: Fri Mar 18 15:05:49 UTC 2016
Modified Files:
src/usr.bin/config: defs.h
Log Message:
match the updated <sys/types.h> definition
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/config/defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.94 src/usr.bin/config/defs.h:1.95
--- src/usr.bin/config/defs.h:1.94 Thu Nov 12 09:38:21 2015
+++ src/usr.bin/config/defs.h Fri Mar 18 11:05:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.94 2015/11/12 14:38:21 pooka Exp $ */
+/* $NetBSD: defs.h,v 1.95 2016/03/18 15:05:49 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,9 +89,9 @@
#define major(x) ((devmajor_t)((((x) & 0x000fff00) >> 8)))
#define minor(x) ((devminor_t)((((x) & 0xfff00000) >> 12) | \
(((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)))
#define __attribute__(x)
#endif /* MAKE_BOOTSTRAP */