diff options
author | mpp <mpp@FreeBSD.org> | 1997-03-18 19:37:41 +0000 |
---|---|---|
committer | mpp <mpp@FreeBSD.org> | 1997-03-18 19:37:41 +0000 |
commit | c80207ab497d53f6b4e875029804295bbed9cb56 (patch) | |
tree | 8d23040c7ea9ff0f9d863cc3a1849433228224f2 /usr.bin/file/names.h | |
parent | b15d6bfc2978bb74d2f16e720b496d73d2da89f2 (diff) | |
download | FreeBSD-src-c80207ab497d53f6b4e875029804295bbed9cb56.zip FreeBSD-src-c80207ab497d53f6b4e875029804295bbed9cb56.tar.gz |
Merge to resolve conflicts with file 3.22 merge.
Diffstat (limited to 'usr.bin/file/names.h')
-rw-r--r-- | usr.bin/file/names.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h index 91e2b4d..1fed1bf 100644 --- a/usr.bin/file/names.h +++ b/usr.bin/file/names.h @@ -10,22 +10,24 @@ * * See LEGAL.NOTICE * - * $Id$ + * $Id: names.h,v 1.1.1.3 1997/03/18 17:58:52 mpp Exp $ */ /* these types are used to index the table 'types': keep em in sync! */ #define L_C 0 /* first and foremost on UNIX */ -#define L_FORT 1 /* the oldest one */ -#define L_MAKE 2 /* Makefiles */ -#define L_PLI 3 /* PL/1 */ -#define L_MACH 4 /* some kinda assembler */ -#define L_ENG 5 /* English */ -#define L_PAS 6 /* Pascal */ -#define L_MAIL 7 /* Electronic mail */ -#define L_NEWS 8 /* Usenet Netnews */ +#define L_CC 1 /* Bjarne's postincrement */ +#define L_FORT 2 /* the oldest one */ +#define L_MAKE 3 /* Makefiles */ +#define L_PLI 4 /* PL/1 */ +#define L_MACH 5 /* some kinda assembler */ +#define L_ENG 6 /* English */ +#define L_PAS 7 /* Pascal */ +#define L_MAIL 8 /* Electronic mail */ +#define L_NEWS 9 /* Usenet Netnews */ static char *types[] = { "C program text", + "C++ program text", "FORTRAN program text", "make commands text" , "PL/1 program text", @@ -43,6 +45,12 @@ static struct names { } names[] = { /* These must be sorted by eye for optimal hit rate */ /* Add to this list only after substantial meditation */ + {"//", L_CC}, + {"template", L_CC}, + {"virtual", L_CC}, + {"class", L_CC}, + {"public:", L_CC}, + {"private:", L_CC}, {"/*", L_C}, /* must precede "The", "the", etc. */ {"#include", L_C}, {"char", L_C}, |