[postgis-tickets] r17516 - Fix travis build

[Raul]

Author: algunenano
Date: 2019-06-12 08:27:01 -0700 (Wed, 12 Jun 2019)
New Revision: 17516

Modified:
   branches/2.5/.travis.yml
   branches/2.5/libpgcommon/gserialized_gist.h
   branches/2.5/postgis/gserialized_gist_nd.c
Log:
Fix travis build

Closes #4426


Modified: branches/2.5/.travis.yml
===================================================================
--- branches/2.5/.travis.yml	2019-06-12 14:04:41 UTC (rev 17515)
+++ branches/2.5/.travis.yml	2019-06-12 15:27:01 UTC (rev 17516)
@@ -7,13 +7,9 @@
 
 addons:
   postgresql: "9.6"
-  apt:
-    packages:
-      - eatmydata
 
 before_install:
   - eval "${MATRIX_EVAL}"
-  - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload"
   - curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | sudo tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
   - curl -sSfL https://raw.githubusercontent.com/mapbox/logbt/30c554dd37b6c96c23fc424f75910fc6d6696f00/bin/logbt | sudo tee /usr/local/bin/logbt > /dev/null
   - sudo logbt --setup
@@ -27,7 +23,7 @@
   - sudo apt-get update -qq
   - mkdir -p /home/travis/deb && touch /home/travis/deb/__ && sudo cp -n /home/travis/deb/* /var/cache/apt/archives || true
   - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev postgresql-server-dev-9.6 libxml2-utils libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex libgeos-dev libjson0-dev libgdal-dev gdb libc6-dbg
-  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ artful main restricted universe multiverse >> /etc/apt/sources.list"
+  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse >> /etc/apt/sources.list"
   - sudo apt-get update -qq
   - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests binutils libproj-dev libprotobuf-c-dev protobuf-c-compiler
   - cp -n /var/cache/apt/archives/* /home/travis/deb || true
@@ -45,7 +41,7 @@
 
 compiler: gcc
 
-dist: trusty
+dist: xenial
 
 cache:
   ccache: true

Modified: branches/2.5/libpgcommon/gserialized_gist.h
===================================================================
--- branches/2.5/libpgcommon/gserialized_gist.h	2019-06-12 14:04:41 UTC (rev 17515)
+++ branches/2.5/libpgcommon/gserialized_gist.h	2019-06-12 15:27:01 UTC (rev 17516)
@@ -147,6 +147,7 @@
 bool box2df_overabove(const BOX2DF *a, const BOX2DF *b);
 
 
+void gidx_validate(GIDX *b);
 bool gidx_contains(GIDX *a, GIDX *b);
 int gserialized_datum_get_box2df_p(Datum gsdatum, BOX2DF *box2df);
 

Modified: branches/2.5/postgis/gserialized_gist_nd.c
===================================================================
--- branches/2.5/postgis/gserialized_gist_nd.c	2019-06-12 14:04:41 UTC (rev 17515)
+++ branches/2.5/postgis/gserialized_gist_nd.c	2019-06-12 15:27:01 UTC (rev 17516)
@@ -133,19 +133,19 @@
 
 
 /* Ensure all minimums are below maximums. */
-static inline void gidx_validate(GIDX *b)
+void
+gidx_validate(GIDX *b)
 {
 	uint32_t i;
 	Assert(b);
-	POSTGIS_DEBUGF(5,"validating gidx (%s)", gidx_to_string(b));
-	for ( i = 0; i < GIDX_NDIMS(b); i++ )
+	POSTGIS_DEBUGF(5, "validating gidx (%s)", gidx_to_string(b));
+	for (i = 0; i < GIDX_NDIMS(b); i++)
 	{
-		if ( GIDX_GET_MIN(b,i) > GIDX_GET_MAX(b,i) )
+		if (GIDX_GET_MIN(b, i) > GIDX_GET_MAX(b, i))
 		{
-			float tmp;
-			tmp = GIDX_GET_MIN(b,i);
-			GIDX_SET_MIN(b,i,GIDX_GET_MAX(b,i));
-			GIDX_SET_MAX(b,i,tmp);
+			float tmp = GIDX_GET_MIN(b, i);
+			GIDX_SET_MIN(b, i, GIDX_GET_MAX(b, i));
+			GIDX_SET_MAX(b, i, tmp);
 		}
 	}
 	return;