Fix travis build

Closes #4426

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

diff --git a/.travis.yml b/.travis.yml
index 3fb774fecb778c980ff757dc2517c8b465ac333e..8ba4e0dbacd4ce7bb85648d3961453484d85dc9a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,9 @@ env:
 
 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 @@ before_install:
   - 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 @@ language: c
 
 compiler: gcc
 
-dist: trusty
+dist: xenial
 
 cache:
   ccache: true

diff --git a/libpgcommon/gserialized_gist.h b/libpgcommon/gserialized_gist.h
index cfbced06784a2ca0050bd5e4f8dc3522fefe4138..dc06240fe24c07d9a2d95d857729e8473b72b37d 100644 (file)
--- a/libpgcommon/gserialized_gist.h
+++ b/libpgcommon/gserialized_gist.h
@@ -147,6 +147,7 @@ bool box2df_above(const BOX2DF *a, const BOX2DF *b);
 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);
 

diff --git a/postgis/gserialized_gist_nd.c b/postgis/gserialized_gist_nd.c
index 6fced11da1cefbd4bb3e56bbcca4eced3dbbbea7..c3ed6305be90eb5d3f65c6f75d364e9c22f9ae79 100644 (file)
--- a/postgis/gserialized_gist_nd.c
+++ b/postgis/gserialized_gist_nd.c
@@ -133,19 +133,19 @@ GIDX* gidx_copy(GIDX *b)
 
 
 /* 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;