pbf_parser 0.1.0 → 0.2.0

data/ext/pbf_parser/osmformat.pb-c.h

@@ -1,41 +1,49 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: osmformat.proto */
 
 #ifndef PROTOBUF_C_osmformat_2eproto__INCLUDED
 #define PROTOBUF_C_osmformat_2eproto__INCLUDED
 
-#include <google/protobuf-c/protobuf-c.h>
+#include <protobuf-c/protobuf-c.h>
 
-PROTOBUF_C_BEGIN_DECLS
+PROTOBUF_C__BEGIN_DECLS
 
+#if PROTOBUF_C_VERSION_NUMBER < 1000000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1000002 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
 
-typedef struct _HeaderBlock HeaderBlock;
-typedef struct _HeaderBBox HeaderBBox;
-typedef struct _PrimitiveBlock PrimitiveBlock;
-typedef struct _PrimitiveGroup PrimitiveGroup;
-typedef struct _StringTable StringTable;
-typedef struct _Info Info;
-typedef struct _DenseInfo DenseInfo;
-typedef struct _ChangeSet ChangeSet;
-typedef struct _Node Node;
-typedef struct _DenseNodes DenseNodes;
-typedef struct _Way Way;
-typedef struct _Relation Relation;
+
+typedef struct _OSMPBF__HeaderBlock OSMPBF__HeaderBlock;
+typedef struct _OSMPBF__HeaderBBox OSMPBF__HeaderBBox;
+typedef struct _OSMPBF__PrimitiveBlock OSMPBF__PrimitiveBlock;
+typedef struct _OSMPBF__PrimitiveGroup OSMPBF__PrimitiveGroup;
+typedef struct _OSMPBF__StringTable OSMPBF__StringTable;
+typedef struct _OSMPBF__Info OSMPBF__Info;
+typedef struct _OSMPBF__DenseInfo OSMPBF__DenseInfo;
+typedef struct _OSMPBF__ChangeSet OSMPBF__ChangeSet;
+typedef struct _OSMPBF__Node OSMPBF__Node;
+typedef struct _OSMPBF__DenseNodes OSMPBF__DenseNodes;
+typedef struct _OSMPBF__Way OSMPBF__Way;
+typedef struct _OSMPBF__Relation OSMPBF__Relation;
 
 
 /* --- enums --- */
 
-typedef enum _Relation__MemberType {
-  RELATION__MEMBER_TYPE__NODE = 0,
-  RELATION__MEMBER_TYPE__WAY = 1,
-  RELATION__MEMBER_TYPE__RELATION = 2
-} Relation__MemberType;
+typedef enum _OSMPBF__Relation__MemberType {
+  OSMPBF__RELATION__MEMBER_TYPE__NODE = 0,
+  OSMPBF__RELATION__MEMBER_TYPE__WAY = 1,
+  OSMPBF__RELATION__MEMBER_TYPE__RELATION = 2
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(OSMPBF__RELATION__MEMBER_TYPE)
+} OSMPBF__Relation__MemberType;
 
 /* --- messages --- */
 
-struct  _HeaderBlock
+struct  _OSMPBF__HeaderBlock
 {
   ProtobufCMessage base;
-  HeaderBBox *bbox;
+  OSMPBF__HeaderBBox *bbox;
   size_t n_required_features;
   char **required_features;
   size_t n_optional_features;
@@ -48,12 +56,12 @@ struct  _HeaderBlock
   int64_t osmosis_replication_sequence_number;
   char *osmosis_replication_base_url;
 };
-#define HEADER_BLOCK__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&header_block__descriptor) \
+#define OSMPBF__HEADER_BLOCK__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__header_block__descriptor) \
     , NULL, 0,NULL, 0,NULL, NULL, NULL, 0,0, 0,0, NULL }
 
 
-struct  _HeaderBBox
+struct  _OSMPBF__HeaderBBox
 {
   ProtobufCMessage base;
   int64_t left;
@@ -61,17 +69,17 @@ struct  _HeaderBBox
   int64_t top;
   int64_t bottom;
 };
-#define HEADER_BBOX__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&header_bbox__descriptor) \
+#define OSMPBF__HEADER_BBOX__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__header_bbox__descriptor) \
     , 0, 0, 0, 0 }
 
 
-struct  _PrimitiveBlock
+struct  _OSMPBF__PrimitiveBlock
 {
   ProtobufCMessage base;
-  StringTable *stringtable;
+  OSMPBF__StringTable *stringtable;
   size_t n_primitivegroup;
-  PrimitiveGroup **primitivegroup;
+  OSMPBF__PrimitiveGroup **primitivegroup;
   protobuf_c_boolean has_granularity;
   int32_t granularity;
   protobuf_c_boolean has_lat_offset;
@@ -81,41 +89,41 @@ struct  _PrimitiveBlock
   protobuf_c_boolean has_date_granularity;
   int32_t date_granularity;
 };
-#define PRIMITIVE_BLOCK__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&primitive_block__descriptor) \
-    , NULL, 0,NULL, 0,100, 0,0, 0,0, 0,1000 }
+#define OSMPBF__PRIMITIVE_BLOCK__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__primitive_block__descriptor) \
+    , NULL, 0,NULL, 0,100, 0,0ll, 0,0ll, 0,1000 }
 
 
-struct  _PrimitiveGroup
+struct  _OSMPBF__PrimitiveGroup
 {
   ProtobufCMessage base;
   size_t n_nodes;
-  Node **nodes;
-  DenseNodes *dense;
+  OSMPBF__Node **nodes;
+  OSMPBF__DenseNodes *dense;
   size_t n_ways;
-  Way **ways;
+  OSMPBF__Way **ways;
   size_t n_relations;
-  Relation **relations;
+  OSMPBF__Relation **relations;
   size_t n_changesets;
-  ChangeSet **changesets;
+  OSMPBF__ChangeSet **changesets;
 };
-#define PRIMITIVE_GROUP__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&primitive_group__descriptor) \
+#define OSMPBF__PRIMITIVE_GROUP__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__primitive_group__descriptor) \
     , 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _StringTable
+struct  _OSMPBF__StringTable
 {
   ProtobufCMessage base;
   size_t n_s;
   ProtobufCBinaryData *s;
 };
-#define STRING_TABLE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&string_table__descriptor) \
+#define OSMPBF__STRING_TABLE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__string_table__descriptor) \
     , 0,NULL }
 
 
-struct  _Info
+struct  _OSMPBF__Info
 {
   ProtobufCMessage base;
   protobuf_c_boolean has_version;
@@ -131,12 +139,12 @@ struct  _Info
   protobuf_c_boolean has_visible;
   protobuf_c_boolean visible;
 };
-#define INFO__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&info__descriptor) \
+#define OSMPBF__INFO__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__info__descriptor) \
     , 0,-1, 0,0, 0,0, 0,0, 0,0, 0,0 }
 
 
-struct  _DenseInfo
+struct  _OSMPBF__DenseInfo
 {
   ProtobufCMessage base;
   size_t n_version;
@@ -152,22 +160,22 @@ struct  _DenseInfo
   size_t n_visible;
   protobuf_c_boolean *visible;
 };
-#define DENSE_INFO__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dense_info__descriptor) \
+#define OSMPBF__DENSE_INFO__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__dense_info__descriptor) \
     , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _ChangeSet
+struct  _OSMPBF__ChangeSet
 {
   ProtobufCMessage base;
   int64_t id;
 };
-#define CHANGE_SET__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&change_set__descriptor) \
+#define OSMPBF__CHANGE_SET__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__change_set__descriptor) \
     , 0 }
 
 
-struct  _Node
+struct  _OSMPBF__Node
 {
   ProtobufCMessage base;
   int64_t id;
@@ -175,21 +183,21 @@ struct  _Node
   uint32_t *keys;
   size_t n_vals;
   uint32_t *vals;
-  Info *info;
+  OSMPBF__Info *info;
   int64_t lat;
   int64_t lon;
 };
-#define NODE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&node__descriptor) \
+#define OSMPBF__NODE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__node__descriptor) \
     , 0, 0,NULL, 0,NULL, NULL, 0, 0 }
 
 
-struct  _DenseNodes
+struct  _OSMPBF__DenseNodes
 {
   ProtobufCMessage base;
   size_t n_id;
   int64_t *id;
-  DenseInfo *denseinfo;
+  OSMPBF__DenseInfo *denseinfo;
   size_t n_lat;
   int64_t *lat;
   size_t n_lon;
@@ -197,12 +205,12 @@ struct  _DenseNodes
   size_t n_keys_vals;
   int32_t *keys_vals;
 };
-#define DENSE_NODES__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dense_nodes__descriptor) \
+#define OSMPBF__DENSE_NODES__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__dense_nodes__descriptor) \
     , 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _Way
+struct  _OSMPBF__Way
 {
   ProtobufCMessage base;
   int64_t id;
@@ -210,16 +218,16 @@ struct  _Way
   uint32_t *keys;
   size_t n_vals;
   uint32_t *vals;
-  Info *info;
+  OSMPBF__Info *info;
   size_t n_refs;
   int64_t *refs;
 };
-#define WAY__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&way__descriptor) \
+#define OSMPBF__WAY__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__way__descriptor) \
     , 0, 0,NULL, 0,NULL, NULL, 0,NULL }
 
 
-struct  _Relation
+struct  _OSMPBF__Relation
 {
   ProtobufCMessage base;
   int64_t id;
@@ -227,284 +235,284 @@ struct  _Relation
   uint32_t *keys;
   size_t n_vals;
   uint32_t *vals;
-  Info *info;
+  OSMPBF__Info *info;
   size_t n_roles_sid;
   int32_t *roles_sid;
   size_t n_memids;
   int64_t *memids;
   size_t n_types;
-  Relation__MemberType *types;
+  OSMPBF__Relation__MemberType *types;
 };
-#define RELATION__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&relation__descriptor) \
+#define OSMPBF__RELATION__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&osmpbf__relation__descriptor) \
     , 0, 0,NULL, 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-/* HeaderBlock methods */
-void   header_block__init
-                     (HeaderBlock         *message);
-size_t header_block__get_packed_size
-                     (const HeaderBlock   *message);
-size_t header_block__pack
-                     (const HeaderBlock   *message,
+/* OSMPBF__HeaderBlock methods */
+void   osmpbf__header_block__init
+                     (OSMPBF__HeaderBlock         *message);
+size_t osmpbf__header_block__get_packed_size
+                     (const OSMPBF__HeaderBlock   *message);
+size_t osmpbf__header_block__pack
+                     (const OSMPBF__HeaderBlock   *message,
                       uint8_t             *out);
-size_t header_block__pack_to_buffer
-                     (const HeaderBlock   *message,
+size_t osmpbf__header_block__pack_to_buffer
+                     (const OSMPBF__HeaderBlock   *message,
                       ProtobufCBuffer     *buffer);
-HeaderBlock *
-       header_block__unpack
+OSMPBF__HeaderBlock *
+       osmpbf__header_block__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   header_block__free_unpacked
-                     (HeaderBlock *message,
+void   osmpbf__header_block__free_unpacked
+                     (OSMPBF__HeaderBlock *message,
                       ProtobufCAllocator *allocator);
-/* HeaderBBox methods */
-void   header_bbox__init
-                     (HeaderBBox         *message);
-size_t header_bbox__get_packed_size
-                     (const HeaderBBox   *message);
-size_t header_bbox__pack
-                     (const HeaderBBox   *message,
+/* OSMPBF__HeaderBBox methods */
+void   osmpbf__header_bbox__init
+                     (OSMPBF__HeaderBBox         *message);
+size_t osmpbf__header_bbox__get_packed_size
+                     (const OSMPBF__HeaderBBox   *message);
+size_t osmpbf__header_bbox__pack
+                     (const OSMPBF__HeaderBBox   *message,
                       uint8_t             *out);
-size_t header_bbox__pack_to_buffer
-                     (const HeaderBBox   *message,
+size_t osmpbf__header_bbox__pack_to_buffer
+                     (const OSMPBF__HeaderBBox   *message,
                       ProtobufCBuffer     *buffer);
-HeaderBBox *
-       header_bbox__unpack
+OSMPBF__HeaderBBox *
+       osmpbf__header_bbox__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   header_bbox__free_unpacked
-                     (HeaderBBox *message,
+void   osmpbf__header_bbox__free_unpacked
+                     (OSMPBF__HeaderBBox *message,
                       ProtobufCAllocator *allocator);
-/* PrimitiveBlock methods */
-void   primitive_block__init
-                     (PrimitiveBlock         *message);
-size_t primitive_block__get_packed_size
-                     (const PrimitiveBlock   *message);
-size_t primitive_block__pack
-                     (const PrimitiveBlock   *message,
+/* OSMPBF__PrimitiveBlock methods */
+void   osmpbf__primitive_block__init
+                     (OSMPBF__PrimitiveBlock         *message);
+size_t osmpbf__primitive_block__get_packed_size
+                     (const OSMPBF__PrimitiveBlock   *message);
+size_t osmpbf__primitive_block__pack
+                     (const OSMPBF__PrimitiveBlock   *message,
                       uint8_t             *out);
-size_t primitive_block__pack_to_buffer
-                     (const PrimitiveBlock   *message,
+size_t osmpbf__primitive_block__pack_to_buffer
+                     (const OSMPBF__PrimitiveBlock   *message,
                       ProtobufCBuffer     *buffer);
-PrimitiveBlock *
-       primitive_block__unpack
+OSMPBF__PrimitiveBlock *
+       osmpbf__primitive_block__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   primitive_block__free_unpacked
-                     (PrimitiveBlock *message,
+void   osmpbf__primitive_block__free_unpacked
+                     (OSMPBF__PrimitiveBlock *message,
                       ProtobufCAllocator *allocator);
-/* PrimitiveGroup methods */
-void   primitive_group__init
-                     (PrimitiveGroup         *message);
-size_t primitive_group__get_packed_size
-                     (const PrimitiveGroup   *message);
-size_t primitive_group__pack
-                     (const PrimitiveGroup   *message,
+/* OSMPBF__PrimitiveGroup methods */
+void   osmpbf__primitive_group__init
+                     (OSMPBF__PrimitiveGroup         *message);
+size_t osmpbf__primitive_group__get_packed_size
+                     (const OSMPBF__PrimitiveGroup   *message);
+size_t osmpbf__primitive_group__pack
+                     (const OSMPBF__PrimitiveGroup   *message,
                       uint8_t             *out);
-size_t primitive_group__pack_to_buffer
-                     (const PrimitiveGroup   *message,
+size_t osmpbf__primitive_group__pack_to_buffer
+                     (const OSMPBF__PrimitiveGroup   *message,
                       ProtobufCBuffer     *buffer);
-PrimitiveGroup *
-       primitive_group__unpack
+OSMPBF__PrimitiveGroup *
+       osmpbf__primitive_group__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   primitive_group__free_unpacked
-                     (PrimitiveGroup *message,
+void   osmpbf__primitive_group__free_unpacked
+                     (OSMPBF__PrimitiveGroup *message,
                       ProtobufCAllocator *allocator);
-/* StringTable methods */
-void   string_table__init
-                     (StringTable         *message);
-size_t string_table__get_packed_size
-                     (const StringTable   *message);
-size_t string_table__pack
-                     (const StringTable   *message,
+/* OSMPBF__StringTable methods */
+void   osmpbf__string_table__init
+                     (OSMPBF__StringTable         *message);
+size_t osmpbf__string_table__get_packed_size
+                     (const OSMPBF__StringTable   *message);
+size_t osmpbf__string_table__pack
+                     (const OSMPBF__StringTable   *message,
                       uint8_t             *out);
-size_t string_table__pack_to_buffer
-                     (const StringTable   *message,
+size_t osmpbf__string_table__pack_to_buffer
+                     (const OSMPBF__StringTable   *message,
                       ProtobufCBuffer     *buffer);
-StringTable *
-       string_table__unpack
+OSMPBF__StringTable *
+       osmpbf__string_table__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   string_table__free_unpacked
-                     (StringTable *message,
+void   osmpbf__string_table__free_unpacked
+                     (OSMPBF__StringTable *message,
                       ProtobufCAllocator *allocator);
-/* Info methods */
-void   info__init
-                     (Info         *message);
-size_t info__get_packed_size
-                     (const Info   *message);
-size_t info__pack
-                     (const Info   *message,
+/* OSMPBF__Info methods */
+void   osmpbf__info__init
+                     (OSMPBF__Info         *message);
+size_t osmpbf__info__get_packed_size
+                     (const OSMPBF__Info   *message);
+size_t osmpbf__info__pack
+                     (const OSMPBF__Info   *message,
                       uint8_t             *out);
-size_t info__pack_to_buffer
-                     (const Info   *message,
+size_t osmpbf__info__pack_to_buffer
+                     (const OSMPBF__Info   *message,
                       ProtobufCBuffer     *buffer);
-Info *
-       info__unpack
+OSMPBF__Info *
+       osmpbf__info__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   info__free_unpacked
-                     (Info *message,
+void   osmpbf__info__free_unpacked
+                     (OSMPBF__Info *message,
                       ProtobufCAllocator *allocator);
-/* DenseInfo methods */
-void   dense_info__init
-                     (DenseInfo         *message);
-size_t dense_info__get_packed_size
-                     (const DenseInfo   *message);
-size_t dense_info__pack
-                     (const DenseInfo   *message,
+/* OSMPBF__DenseInfo methods */
+void   osmpbf__dense_info__init
+                     (OSMPBF__DenseInfo         *message);
+size_t osmpbf__dense_info__get_packed_size
+                     (const OSMPBF__DenseInfo   *message);
+size_t osmpbf__dense_info__pack
+                     (const OSMPBF__DenseInfo   *message,
                       uint8_t             *out);
-size_t dense_info__pack_to_buffer
-                     (const DenseInfo   *message,
+size_t osmpbf__dense_info__pack_to_buffer
+                     (const OSMPBF__DenseInfo   *message,
                       ProtobufCBuffer     *buffer);
-DenseInfo *
-       dense_info__unpack
+OSMPBF__DenseInfo *
+       osmpbf__dense_info__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   dense_info__free_unpacked
-                     (DenseInfo *message,
+void   osmpbf__dense_info__free_unpacked
+                     (OSMPBF__DenseInfo *message,
                       ProtobufCAllocator *allocator);
-/* ChangeSet methods */
-void   change_set__init
-                     (ChangeSet         *message);
-size_t change_set__get_packed_size
-                     (const ChangeSet   *message);
-size_t change_set__pack
-                     (const ChangeSet   *message,
+/* OSMPBF__ChangeSet methods */
+void   osmpbf__change_set__init
+                     (OSMPBF__ChangeSet         *message);
+size_t osmpbf__change_set__get_packed_size
+                     (const OSMPBF__ChangeSet   *message);
+size_t osmpbf__change_set__pack
+                     (const OSMPBF__ChangeSet   *message,
                       uint8_t             *out);
-size_t change_set__pack_to_buffer
-                     (const ChangeSet   *message,
+size_t osmpbf__change_set__pack_to_buffer
+                     (const OSMPBF__ChangeSet   *message,
                       ProtobufCBuffer     *buffer);
-ChangeSet *
-       change_set__unpack
+OSMPBF__ChangeSet *
+       osmpbf__change_set__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   change_set__free_unpacked
-                     (ChangeSet *message,
+void   osmpbf__change_set__free_unpacked
+                     (OSMPBF__ChangeSet *message,
                       ProtobufCAllocator *allocator);
-/* Node methods */
-void   node__init
-                     (Node         *message);
-size_t node__get_packed_size
-                     (const Node   *message);
-size_t node__pack
-                     (const Node   *message,
+/* OSMPBF__Node methods */
+void   osmpbf__node__init
+                     (OSMPBF__Node         *message);
+size_t osmpbf__node__get_packed_size
+                     (const OSMPBF__Node   *message);
+size_t osmpbf__node__pack
+                     (const OSMPBF__Node   *message,
                       uint8_t             *out);
-size_t node__pack_to_buffer
-                     (const Node   *message,
+size_t osmpbf__node__pack_to_buffer
+                     (const OSMPBF__Node   *message,
                       ProtobufCBuffer     *buffer);
-Node *
-       node__unpack
+OSMPBF__Node *
+       osmpbf__node__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   node__free_unpacked
-                     (Node *message,
+void   osmpbf__node__free_unpacked
+                     (OSMPBF__Node *message,
                       ProtobufCAllocator *allocator);
-/* DenseNodes methods */
-void   dense_nodes__init
-                     (DenseNodes         *message);
-size_t dense_nodes__get_packed_size
-                     (const DenseNodes   *message);
-size_t dense_nodes__pack
-                     (const DenseNodes   *message,
+/* OSMPBF__DenseNodes methods */
+void   osmpbf__dense_nodes__init
+                     (OSMPBF__DenseNodes         *message);
+size_t osmpbf__dense_nodes__get_packed_size
+                     (const OSMPBF__DenseNodes   *message);
+size_t osmpbf__dense_nodes__pack
+                     (const OSMPBF__DenseNodes   *message,
                       uint8_t             *out);
-size_t dense_nodes__pack_to_buffer
-                     (const DenseNodes   *message,
+size_t osmpbf__dense_nodes__pack_to_buffer
+                     (const OSMPBF__DenseNodes   *message,
                       ProtobufCBuffer     *buffer);
-DenseNodes *
-       dense_nodes__unpack
+OSMPBF__DenseNodes *
+       osmpbf__dense_nodes__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   dense_nodes__free_unpacked
-                     (DenseNodes *message,
+void   osmpbf__dense_nodes__free_unpacked
+                     (OSMPBF__DenseNodes *message,
                       ProtobufCAllocator *allocator);
-/* Way methods */
-void   way__init
-                     (Way         *message);
-size_t way__get_packed_size
-                     (const Way   *message);
-size_t way__pack
-                     (const Way   *message,
+/* OSMPBF__Way methods */
+void   osmpbf__way__init
+                     (OSMPBF__Way         *message);
+size_t osmpbf__way__get_packed_size
+                     (const OSMPBF__Way   *message);
+size_t osmpbf__way__pack
+                     (const OSMPBF__Way   *message,
                       uint8_t             *out);
-size_t way__pack_to_buffer
-                     (const Way   *message,
+size_t osmpbf__way__pack_to_buffer
+                     (const OSMPBF__Way   *message,
                       ProtobufCBuffer     *buffer);
-Way *
-       way__unpack
+OSMPBF__Way *
+       osmpbf__way__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   way__free_unpacked
-                     (Way *message,
+void   osmpbf__way__free_unpacked
+                     (OSMPBF__Way *message,
                       ProtobufCAllocator *allocator);
-/* Relation methods */
-void   relation__init
-                     (Relation         *message);
-size_t relation__get_packed_size
-                     (const Relation   *message);
-size_t relation__pack
-                     (const Relation   *message,
+/* OSMPBF__Relation methods */
+void   osmpbf__relation__init
+                     (OSMPBF__Relation         *message);
+size_t osmpbf__relation__get_packed_size
+                     (const OSMPBF__Relation   *message);
+size_t osmpbf__relation__pack
+                     (const OSMPBF__Relation   *message,
                       uint8_t             *out);
-size_t relation__pack_to_buffer
-                     (const Relation   *message,
+size_t osmpbf__relation__pack_to_buffer
+                     (const OSMPBF__Relation   *message,
                       ProtobufCBuffer     *buffer);
-Relation *
-       relation__unpack
+OSMPBF__Relation *
+       osmpbf__relation__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   relation__free_unpacked
-                     (Relation *message,
+void   osmpbf__relation__free_unpacked
+                     (OSMPBF__Relation *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*HeaderBlock_Closure)
-                 (const HeaderBlock *message,
+typedef void (*OSMPBF__HeaderBlock_Closure)
+                 (const OSMPBF__HeaderBlock *message,
                   void *closure_data);
-typedef void (*HeaderBBox_Closure)
-                 (const HeaderBBox *message,
+typedef void (*OSMPBF__HeaderBBox_Closure)
+                 (const OSMPBF__HeaderBBox *message,
                   void *closure_data);
-typedef void (*PrimitiveBlock_Closure)
-                 (const PrimitiveBlock *message,
+typedef void (*OSMPBF__PrimitiveBlock_Closure)
+                 (const OSMPBF__PrimitiveBlock *message,
                   void *closure_data);
-typedef void (*PrimitiveGroup_Closure)
-                 (const PrimitiveGroup *message,
+typedef void (*OSMPBF__PrimitiveGroup_Closure)
+                 (const OSMPBF__PrimitiveGroup *message,
                   void *closure_data);
-typedef void (*StringTable_Closure)
-                 (const StringTable *message,
+typedef void (*OSMPBF__StringTable_Closure)
+                 (const OSMPBF__StringTable *message,
                   void *closure_data);
-typedef void (*Info_Closure)
-                 (const Info *message,
+typedef void (*OSMPBF__Info_Closure)
+                 (const OSMPBF__Info *message,
                   void *closure_data);
-typedef void (*DenseInfo_Closure)
-                 (const DenseInfo *message,
+typedef void (*OSMPBF__DenseInfo_Closure)
+                 (const OSMPBF__DenseInfo *message,
                   void *closure_data);
-typedef void (*ChangeSet_Closure)
-                 (const ChangeSet *message,
+typedef void (*OSMPBF__ChangeSet_Closure)
+                 (const OSMPBF__ChangeSet *message,
                   void *closure_data);
-typedef void (*Node_Closure)
-                 (const Node *message,
+typedef void (*OSMPBF__Node_Closure)
+                 (const OSMPBF__Node *message,
                   void *closure_data);
-typedef void (*DenseNodes_Closure)
-                 (const DenseNodes *message,
+typedef void (*OSMPBF__DenseNodes_Closure)
+                 (const OSMPBF__DenseNodes *message,
                   void *closure_data);
-typedef void (*Way_Closure)
-                 (const Way *message,
+typedef void (*OSMPBF__Way_Closure)
+                 (const OSMPBF__Way *message,
                   void *closure_data);
-typedef void (*Relation_Closure)
-                 (const Relation *message,
+typedef void (*OSMPBF__Relation_Closure)
+                 (const OSMPBF__Relation *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -512,21 +520,21 @@ typedef void (*Relation_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor header_block__descriptor;
-extern const ProtobufCMessageDescriptor header_bbox__descriptor;
-extern const ProtobufCMessageDescriptor primitive_block__descriptor;
-extern const ProtobufCMessageDescriptor primitive_group__descriptor;
-extern const ProtobufCMessageDescriptor string_table__descriptor;
-extern const ProtobufCMessageDescriptor info__descriptor;
-extern const ProtobufCMessageDescriptor dense_info__descriptor;
-extern const ProtobufCMessageDescriptor change_set__descriptor;
-extern const ProtobufCMessageDescriptor node__descriptor;
-extern const ProtobufCMessageDescriptor dense_nodes__descriptor;
-extern const ProtobufCMessageDescriptor way__descriptor;
-extern const ProtobufCMessageDescriptor relation__descriptor;
-extern const ProtobufCEnumDescriptor    relation__member_type__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__header_block__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__header_bbox__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__primitive_block__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__primitive_group__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__string_table__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__info__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__dense_info__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__change_set__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__node__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__dense_nodes__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__way__descriptor;
+extern const ProtobufCMessageDescriptor osmpbf__relation__descriptor;
+extern const ProtobufCEnumDescriptor    osmpbf__relation__member_type__descriptor;
 
-PROTOBUF_C_END_DECLS
+PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_osmformat_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_osmformat_2eproto__INCLUDED */