#3184, blink fix for PgSQL 11 compile issues on protobuf, will test shortly

git-svn-id: http://svn.osgeo.org/postgis/trunk@15653 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/geobuf.c b/postgis/geobuf.c
index 6c5ca1f7cb75ea83b808de78280078066b10e54c..c6d759ab5524d0150f87b811d57b3d2d4ad218e6 100644 (file)
--- a/postgis/geobuf.c
+++ b/postgis/geobuf.c
@@ -57,7 +57,11 @@ static void encode_keys(struct geobuf_agg_context *ctx)
        uint32_t i, k = 0;
        bool geom_name_found = false;
        for (i = 0; i < natts; i++) {
+#if POSTGIS_PGSQL_VERSION < 110
                char *tkey = tupdesc->attrs[i]->attname.data;
+#else
+               char *tkey = tupdesc->attrs[i].attname.data;
+#endif
                char *key = palloc(strlen(tkey) + 1);
                strcpy(key, tkey);
                if (strcmp(key, ctx->geom_name) == 0) {
@@ -113,7 +117,11 @@ static void encode_properties(struct geobuf_agg_context *ctx,
                datum = GetAttributeByNum(ctx->row, i + 1, &isnull);
                if (isnull)
                        continue;
+#if POSTGIS_PGSQL_VERSION < 110
                Oid typoid = getBaseType(tupdesc->attrs[i]->atttypid);
+#else
+               Oid typoid = getBaseType(tupdesc->attrs[i].atttypid);
+#endif
                if (strcmp(type, "int2") == 0) {
                        set_int_value(value, DatumGetInt16(datum));
                } else if (strcmp(type, "int4") == 0) {

diff --git a/postgis/mvt.c b/postgis/mvt.c
index d73f193e086ff831b829dbb768da52c17f1432ec..6668fa84b13c45b6cf2974edba6e339b9043978f 100644 (file)
--- a/postgis/mvt.c
+++ b/postgis/mvt.c
@@ -304,12 +304,17 @@ static void parse_column_keys(struct mvt_agg_context *ctx)
        uint32_t i;
        bool geom_name_found = false;
        for (i = 0; i < natts; i++) {
+#if POSTGIS_PGSQL_VERSION < 110                
                Oid typoid = getBaseType(tupdesc->attrs[i]->atttypid);
+               char *tkey = tupdesc->attrs[i]->attname.data;
+#else
+               Oid typoid = getBaseType(tupdesc->attrs[i].atttypid);
+               char *tkey = tupdesc->attrs[i].attname.data;
+#endif
 #if POSTGIS_PGSQL_VERSION >= 94
                if (typoid == JSONBOID)
                        continue;
 #endif
-               char *tkey = tupdesc->attrs[i]->attname.data;
                char *key = palloc(strlen(tkey) + 1);
                strcpy(key, tkey);
                if (strcmp(key, ctx->geom_name) == 0) {
@@ -550,9 +555,14 @@ static void parse_values(struct mvt_agg_context *ctx)
                if (i == ctx->geom_index)
                        continue;
 
+#if POSTGIS_PGSQL_VERSION < 110                
                char *key = tupdesc->attrs[i]->attname.data;
-               Datum datum = GetAttributeByNum(ctx->row, i+1, &isnull);
                Oid typoid = getBaseType(tupdesc->attrs[i]->atttypid);
+#else
+               char *key = tupdesc->attrs[i].attname.data;
+               Oid typoid = getBaseType(tupdesc->attrs[i].atttypid);
+#endif
+               Datum datum = GetAttributeByNum(ctx->row, i+1, &isnull);
                k = get_key_index(ctx, key);
                if (isnull) {
                        POSTGIS_DEBUG(3, "parse_values isnull detected");