Rename enum values for taxonomy

This avoids confusion and namespace collisions.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-02 10:21:35 -07:00
parent 08f8eb6eb5
commit bc8c54f1ee
10 changed files with 22 additions and 22 deletions

View file

@ -6,17 +6,17 @@ extern "C" {
#endif
enum taxonomy_category {
NONE,
OCEAN,
COUNTRY,
ADMIN_L1,
ADMIN_L2,
LOCALNAME,
NR_CATEGORIES
TC_NONE,
TC_OCEAN,
TC_COUNTRY,
TC_ADMIN_L1,
TC_ADMIN_L2,
TC_LOCALNAME,
TC_NR_CATEGORIES
};
extern char *taxonomy_category_names[NR_CATEGORIES];
extern char *taxonomy_api_names[NR_CATEGORIES];
extern char *taxonomy_category_names[TC_NR_CATEGORIES];
extern char *taxonomy_api_names[TC_NR_CATEGORIES];
struct taxonomy {
int category; /* the category for this tag: ocean, country, admin_l1, admin_l2, localname, etc */