[postgis-tickets] r15292 - Fix build warnings in PostgreSQL-9.6 based builds

[Sandro Santilli]

Author: strk
Date: 2017-01-24 08:37:52 -0800 (Tue, 24 Jan 2017)
New Revision: 15292

Modified:
   trunk/topology/postgis_topology.c
Log:
Fix build warnings in PostgreSQL-9.6 based builds

Closes #3696

NOTE: SPI_processed datatype changed from 32 to 64 bit stsarting
      with PostgreSQL 9.6

Modified: trunk/topology/postgis_topology.c
===================================================================
--- trunk/topology/postgis_topology.c	2017-01-22 07:44:49 UTC (rev 15291)
+++ trunk/topology/postgis_topology.c	2017-01-24 16:37:52 UTC (rev 15292)
@@ -12,6 +12,7 @@
 
 #include "postgres.h"
 #include "fmgr.h"
+#include "c.h" /* for UINT64_FORMAT and uint64 */
 #include "utils/elog.h"
 #include "utils/memutils.h" /* for TopMemoryContext */
 #include "utils/array.h" /* for ArrayType */
@@ -1436,9 +1437,9 @@
   if ( SPI_processed ) topo->be_data->data_changed = true;
 
   if ( SPI_processed != numelems ) {
-		cberror(topo->be_data, "processed %u rows, expected %d",
-            SPI_processed, numelems);
-	  return 0;
+    cberror(topo->be_data, "processed " UINT64_FORMAT " rows, expected %d",
+      (uint64)SPI_processed, numelems);
+    return 0;
   }
 
   /* Set node_id (could skip this if none had it set to -1) */
@@ -1493,9 +1494,9 @@
   if ( SPI_processed ) topo->be_data->data_changed = true;
   POSTGIS_DEBUGF(1, "cb_insertEdges query processed %d rows", SPI_processed);
   if ( SPI_processed != numelems ) {
-		cberror(topo->be_data, "processed %u rows, expected %d",
-            SPI_processed, numelems);
-	  return -1;
+    cberror(topo->be_data, "processed " UINT64_FORMAT " rows, expected %d",
+            (uint64)SPI_processed, numelems);
+    return -1;
   }
 
   if ( needsEdgeIdReturn )
@@ -1551,9 +1552,9 @@
   if ( SPI_processed ) topo->be_data->data_changed = true;
   POSTGIS_DEBUGF(1, "cb_insertFaces query processed %d rows", SPI_processed);
   if ( SPI_processed != numelems ) {
-		cberror(topo->be_data, "processed %u rows, expected %d",
-            SPI_processed, numelems);
-	  return -1;
+    cberror(topo->be_data, "processed " UINT64_FORMAT " rows, expected %d",
+            (uint64)SPI_processed, numelems);
+    return -1;
   }
 
   if ( needsFaceIdReturn )
@@ -1917,8 +1918,9 @@
   if ( SPI_processed ) topo->be_data->data_changed = true;
 
   if ( SPI_processed != 1 ) {
-		cberror(topo->be_data, "processed %d rows, expected 1", SPI_processed);
-	  return -1;
+    cberror(topo->be_data, "processed " UINT64_FORMAT " rows, expected 1",
+            (uint64)SPI_processed);
+    return -1;
   }
 
   dat = SPI_getbinval( SPI_tuptable->vals[0],