X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=osm.h;h=ba240c63078655ad49b84bd054e9c3c5bdd41b02;hb=9f70beb818ec40ca1c8edbd1ee4ee9a50185d60c;hp=80d9fd2df47b33470039f8fe87876813c6e24d67;hpb=314afcc0500a95c818dadbb68db72954cf4145b4;p=leo.git

diff --git a/osm.h b/osm.h
index 80d9fd2..ba240c6 100644
--- a/osm.h
+++ b/osm.h
@@ -77,10 +77,16 @@ struct osm_mpg_boundary {
   clist nodes;			// List of osm_ref's (without back-references, since the boundary is not a regular object)
 };
 
-void osm_init(void);
-void osm_dump(void);
+struct osm {
+  struct mempool *pool;
+  clist obj_list[OSM_TYPE_MAX];
+  struct osm_id_hash_table *id_hash[OSM_TYPE_MAX];
+};
+
+extern struct osm *osm_this;
 
-extern clist osm_obj_list[OSM_TYPE_MAX];
+struct osm *osm_init(void);
+void osm_dump(void);
 
 osm_id_t osm_parse_id(const char *str);
 struct osm_object *osm_obj_find_by_id(enum osm_object_type type, osm_id_t id);
@@ -161,4 +167,8 @@ enum value_names {
 #undef P
 };
 
+/* xml.c */
+
+void osm_xml_parse(const char *name);
+
 #endif