diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-05-16 12:06:14 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-05-16 12:06:14 +0000 |
| commit | db70a191913d2bd834fa6a070e9351c91dee6adb (patch) | |
| tree | 2676acddfa0ad53529d6ec1ebf44d4a2d306a323 | |
| parent | 5e956d5a19d41466b76fe6c8cea6c9458921c0db (diff) | |
| download | navit-svn-db70a191913d2bd834fa6a070e9351c91dee6adb.tar.gz | |
Fix:core:Restore items poi_customg .. poi_customn inroduced in r6021 and accidently removed by highfive merge (r6090).
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6091 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/item.h | 2 | ||||
| -rw-r--r-- | navit/item_def.h | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/navit/item.h b/navit/item.h index 00cc2f47..341d4406 100644 --- a/navit/item.h +++ b/navit/item.h @@ -52,7 +52,7 @@ extern int default_flags[]; #define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7) #define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) #define item_is_point(item) ((item).type < type_line) -#define item_is_custom_poi(item) ((item).type >= type_poi_customo && (item).type < type_line) +#define item_is_custom_poi(item) ((item).type >= type_poi_customg && (item).type < type_line) #define item_is_street(item) (((item).type >= type_street_nopass && (item).type <= type_roundabout) \ || (item).type == type_street_service \ || ((item).type >= type_street_pedestrian && (item).type <= type_track_grass) \ diff --git a/navit/item_def.h b/navit/item_def.h index 0ce616ac..c679cbe7 100644 --- a/navit/item_def.h +++ b/navit/item_def.h @@ -358,7 +358,15 @@ ITEM(nav_exit_left) ITEM(nav_exit_right) ITEM(nav_keep_left) ITEM(nav_keep_right) -ITEM2(0x7fffffe8,poi_customo) +ITEM2(0x7fffffe0,poi_customg) +ITEM(poi_customh) +ITEM(poi_customi) +ITEM(poi_customj) +ITEM(poi_customk) +ITEM(poi_customl) +ITEM(poi_customm) +ITEM(poi_customn) +ITEM(poi_customo) ITEM(poi_customp) ITEM(poi_customq) ITEM(poi_customr) |