common: typeid -> type_id, because typeid is a C++ reserved word.

diff --git a/src/common/native-types.c b/src/common/native-types.c
index 5f541f7..d9890e3 100644 (file)
--- a/src/common/native-types.c
+++ b/src/common/native-types.c
@@ -200,8 +200,8 @@ static inline uint32_t map_type(uint32_t id, mrp_typemap_t *idmap)
     if (id < MRP_TYPE_STRUCT || idmap == NULL)
         mapped = id;
     else {
-        while (idmap->typeid != MRP_INVALID_TYPE) {
-            if (idmap->typeid == id) {
+        while (idmap->type_id != MRP_INVALID_TYPE) {
+            if (idmap->type_id == id) {
                 mapped = MRP_TYPE_STRUCT + idmap->mapped;
                 break;
             }
@@ -221,9 +221,9 @@ static inline uint32_t mapped_type(uint32_t mapped, mrp_typemap_t *idmap)
     if (mapped < MRP_TYPE_STRUCT || idmap == NULL)
         id = mapped;
     else {
-        while (idmap->typeid != MRP_INVALID_TYPE) {
+        while (idmap->type_id != MRP_INVALID_TYPE) {
             if (MRP_TYPE_STRUCT + idmap->mapped == mapped) {
-                id = idmap->typeid;
+                id = idmap->type_id;
                 break;
             }
             else

diff --git a/src/common/native-types.h b/src/common/native-types.h
index 3e86732..ac6dacf 100644 (file)
--- a/src/common/native-types.h
+++ b/src/common/native-types.h
@@ -125,14 +125,14 @@ typedef union {
  */
 
 typedef struct {
-    uint32_t typeid;                     /* native type id */
+    uint32_t type_id;                    /* native type id */
     uint32_t mapped;                     /* mapped type id */
 } mrp_typemap_t;
 
 
 /** Macro to initialize a typemap entry. */
 #define MRP_TYPEMAP(_mapped_id, _type_id)               \
-    { .typeid = _type_id, .mapped = _mapped_id }
+    { .type_id = _type_id, .mapped = _mapped_id }
 
 /** Macro to set a typemap termination entry. */
 #define MRP_TYPEMAP_END                                 \