diff options
| author | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
| commit | 729acffa050ba99227c27884a5760fdd3d6959b2 (patch) | |
| tree | d5289d633f1b84fbbf947f98b34ff58109fccca7 /contrib/file/magic.h | |
| parent | 964611a3050b11c026667dbb4ae98380fe18252a (diff) | |
| parent | 05dd1f1bd993ec12015e6782ea5c46b6a0b69ecb (diff) | |
| download | FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.zip FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.tar.gz | |
Record that base/vendor/file/dist@186675 was merged.
Merge base/vendor/file/dist@186675@186690, bringing FILE 4.26 to 8-CURRENT.
Diffstat (limited to 'contrib/file/magic.h')
| -rw-r--r-- | contrib/file/magic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/file/magic.h b/contrib/file/magic.h index 6041f54..ecdd53c 100644 --- a/contrib/file/magic.h +++ b/contrib/file/magic.h @@ -48,11 +48,12 @@ #define MAGIC_NO_CHECK_APPTYPE 0x008000 /* Don't check application type */ #define MAGIC_NO_CHECK_ELF 0x010000 /* Don't check for elf details */ #define MAGIC_NO_CHECK_ASCII 0x020000 /* Don't check for ascii files */ -#define MAGIC_NO_CHECK_TROFF 0x040000 /* Don't check ascii/troff */ #define MAGIC_NO_CHECK_TOKENS 0x100000 /* Don't check ascii/tokens */ -/* Defined for backwards compatibility; does nothing */ +/* Defined for backwards compatibility; do nothing */ #define MAGIC_NO_CHECK_FORTRAN 0x000000 /* Don't check ascii/fortran */ +#define MAGIC_NO_CHECK_TROFF 0x000000 /* Don't check ascii/troff */ + #ifdef __cplusplus extern "C" { |
