aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/file/fsmagic.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-05-10 18:06:37 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-05-10 18:06:37 +0000
commit38fc822d7fef6a1bbff3793f7c3f3fccfff4e800 (patch)
tree0f08d47013a8363fbb0e11daf34f1040503e1cba /usr.bin/file/fsmagic.c
parent41787a353dea2c88bf317a8df919490d64bf842c (diff)
downloadsrc-38fc822d7fef6a1bbff3793f7c3f3fccfff4e800.tar.gz
src-38fc822d7fef6a1bbff3793f7c3f3fccfff4e800.zip
Don't go looking for weird #includes if major isn't a macro.
Notes
Notes: svn path=/head/; revision=46918
Diffstat (limited to 'usr.bin/file/fsmagic.c')
-rw-r--r--usr.bin/file/fsmagic.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 63b9daa64ec3..b12a617b23ff 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,28 +27,13 @@
#ifndef lint
static const char rcsid[] =
- "$Id$";
+ "$Id: fsmagic.c,v 1.7 1998/01/28 07:36:23 charnier Exp $";
#endif /* not lint */
#include <err.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
-#ifndef major
-# if defined(__SVR4) || defined(_SVR4_SOURCE)
-# include <sys/mkdev.h>
-# endif
-#endif
-#ifndef major /* if `major' not defined in types.h, */
-#include <sys/sysmacros.h> /* try this one. */
-#endif
-#ifndef major /* still not defined? give up, manual intervention needed */
- /* If cc tries to compile this, read and act on it. */
- /* On most systems cpp will discard it automatically */
- Congratulations, you have found a portability bug.
- Please grep /usr/include/sys and edit the above #include
- to point at the file that defines the "major" macro.
-#endif /*major*/
#include "file.h"