-#if MAJOR_IN_MKDEV
- printf("! "); /* XXX trying to debug Solaris build-farm weirdness */
-#else
- if (IS_DEVICE(buf.st_mode))
- printf("%6d,%5d", major(buf.st_rdev), minor(buf.st_rdev));
- else /* NB: use double for size because it might not fit in a long. */
-#endif
+ if (S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) {
+ printf("%5ld,%6ld",
+ (long)major(buf.st_rdev),
+ (long)minor(buf.st_rdev));
+ } else /* NB: use double for size since it might not fit in a long. */