diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-01-19 18:56:41 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-01-19 18:56:41 +0000 |
| commit | 2d29d64f234eb731550f88b6b8007ea38d060da2 (patch) | |
| tree | d82deab6a23f8cc81cc7bb1d618e465431df0991 /navit/xmlconfig.h | |
| parent | 55f4463abda76761be9e0fa284ad96d56916a51d (diff) | |
| download | navit-2d29d64f234eb731550f88b6b8007ea38d060da2.tar.gz | |
Add:Core:Allow layer tag to reference layers within navit context, object handling cleanup
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5340 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xmlconfig.h')
| -rw-r--r-- | navit/xmlconfig.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/navit/xmlconfig.h b/navit/xmlconfig.h index e916eb481..06bc4bf0c 100644 --- a/navit/xmlconfig.h +++ b/navit/xmlconfig.h @@ -54,15 +54,17 @@ struct object_func { void *(*unref)(void *); }; -extern struct object_func map_func, mapset_func, navit_func, tracking_func, vehicle_func, maps_func, layout_func, vehicleprofile_func; +extern struct object_func map_func, mapset_func, navit_func, tracking_func, vehicle_func, maps_func, layout_func, vehicleprofile_func, layer_func; -#define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_trackingo || (x) == attr_vehicle) +#define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_trackingo || (x) == attr_vehicle || (x) == attr_maps || (x) == attr_layout || (x) == attr_vehicleprofile || (x) == attr_layer) +#define NAVIT_OBJECT struct object_func *func; int refcount; struct attr **attrs; struct navit_object { - struct object_func *func; - int refcount; + NAVIT_OBJECT }; +struct navit_object *navit_object_ref(struct navit_object *obj); +void navit_object_unref(struct navit_object *obj); typedef GError xmlerror; |