diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 10:21:35 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 10:22:31 -0700 |
| commit | bc8c54f1eedc550f9cd79abfc69db9934577aac8 (patch) | |
| tree | 569373c575d0c08e3706a8ba79932adaefefa091 /taxonomy.h | |
| parent | 08f8eb6eb51f2855f98c1b351127691dce837894 (diff) | |
| download | subsurface-bc8c54f1eedc550f9cd79abfc69db9934577aac8.tar.gz | |
Rename enum values for taxonomy
This avoids confusion and namespace collisions.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'taxonomy.h')
| -rw-r--r-- | taxonomy.h | 18 |
1 files changed, 9 insertions, 9 deletions
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 */ |