From bc8c54f1eedc550f9cd79abfc69db9934577aac8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 2 Jul 2015 10:21:35 -0700 Subject: Rename enum values for taxonomy This avoids confusion and namespace collisions. Signed-off-by: Dirk Hohndel --- taxonomy.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'taxonomy.h') diff --git a/taxonomy.h b/taxonomy.h index fef6364e2..b6a062a08 100644 --- a/taxonomy.h +++ b/taxonomy.h @@ -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 */ -- cgit v1.2.3-70-g09d2