diff options
author | phk <phk@FreeBSD.org> | 1999-05-12 11:06:56 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-05-12 11:06:56 +0000 |
commit | 429046ddb475a60027e2720e3a3136e7148f1d90 (patch) | |
tree | c54a3d541d1a1337756a62e1f6b27dcb3b7ab7e0 /sys/kern/kern_conf.c | |
parent | 23c70ba4d718333ebf081ab82910303d3f02b74d (diff) | |
download | FreeBSD-src-429046ddb475a60027e2720e3a3136e7148f1d90.zip FreeBSD-src-429046ddb475a60027e2720e3a3136e7148f1d90.tar.gz |
Produce compiler warning if dev_t and udev_t is confused.
Diffstat (limited to 'sys/kern/kern_conf.c')
-rw-r--r-- | sys/kern/kern_conf.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index e6aa738..15e1f4c 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_conf.c,v 1.36 1999/05/09 13:00:46 phk Exp $ + * $Id: kern_conf.c,v 1.37 1999/05/11 19:54:27 phk Exp $ */ #include <sys/param.h> @@ -179,26 +179,30 @@ devsw_module_handler(module_t mod, int what, void* arg) int major(dev_t x) { + u_intptr_t i = (u_int)x; + #ifdef DEVT_FASCIST - return(253 - ((x >> 8) & 0xff)); + return(253 - ((i >> 8) & 0xff)); #else - return((x >> 8) & 0xff); + return((i >> 8) & 0xff); #endif } int minor(dev_t x) { - return(x & 0xffff00ff); + u_intptr_t i = (u_int)x; + + return(i & 0xffff00ff); } dev_t makedev(int x, int y) { #ifdef DEVT_FASCIST - return (((253 - x) << 8) | y); + return ((dev_t) (((253 - x) << 8) | y)); #else - return ((x << 8) | y); + return ((dev_t) ((x << 8) | y)); #endif } |