[postgis-tickets] [SCM] PostGIS branch master updated. 03af80cb3edd40af2fbcb63e27e4fa65e918df18

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  03af80cb3edd40af2fbcb63e27e4fa65e918df18 (commit)
      from  760351911fa74be35330011abf445176fb9b9295 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03af80cb3edd40af2fbcb63e27e4fa65e918df18
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Jan 29 17:43:08 2020 -0500

    Remark out additional guard causing mingw64 to fail.  References #4603

diff --git a/loader/shpopen.c b/loader/shpopen.c
index 136559f..11693c0 100644
--- a/loader/shpopen.c
+++ b/loader/shpopen.c
@@ -1686,7 +1686,8 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /*      Guard FSeek with check for whether we're already at position;   */
 /*      no-op FSeeks defeat network filesystems' write buffering.       */
 /* -------------------------------------------------------------------- */
-    if ( psSHP->sHooks.FTell( psSHP->fpSHP ) != nRecordOffset ) {
+/* TOOK OUT GUARD cause causing mingw64 to fail, see https://trac.osgeo.org/postgis/ticket/4603 */
+    //if ( psSHP->sHooks.FTell( psSHP->fpSHP ) != nRecordOffset ) {
         if( psSHP->sHooks.FSeek( psSHP->fpSHP, nRecordOffset, 0 ) != 0 )
         {
             char szErrorMsg[200];
@@ -1700,7 +1701,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
             free( pabyRec );
             return -1;
         }
-    }
+    //}
     if( psSHP->sHooks.FWrite( pabyRec, nRecordSize, 1, psSHP->fpSHP ) < 1 )
     {
         char szErrorMsg[200];

-----------------------------------------------------------------------

Summary of changes:
 loader/shpopen.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS