summaryrefslogtreecommitdiffstats
path: root/usr.bin/file
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-05-10 18:06:37 +0000
committerphk <phk@FreeBSD.org>1999-05-10 18:06:37 +0000
commit15ee2ac7e1808c386d8fedf7b3512e8b9d6f8c4d (patch)
tree8f96070fe474344b685094c71c35af14b39f099f /usr.bin/file
parente65cf80c48f6aa40f23a054dc927e055c2b34d59 (diff)
downloadFreeBSD-src-15ee2ac7e1808c386d8fedf7b3512e8b9d6f8c4d.zip
FreeBSD-src-15ee2ac7e1808c386d8fedf7b3512e8b9d6f8c4d.tar.gz
Don't go looking for weird #includes if major isn't a macro.
Diffstat (limited to 'usr.bin/file')
-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 63b9daa..b12a617 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"
OpenPOWER on IntegriCloud