[geos-commits] [SCM] GEOS branch master updated. b88d4614aaf3c5e73fd275a88253f62f34c25bb9

[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 "GEOS".

The branch, master has been updated
       via  b88d4614aaf3c5e73fd275a88253f62f34c25bb9 (commit)
      from  9f3e18cf88e1c2d29c5a71af3ca65449ad97c6bb (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 b88d4614aaf3c5e73fd275a88253f62f34c25bb9
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Feb 1 19:26:46 2019 -0500

    Prevent infinite loop in testing on mingw64 64-bit

diff --git a/include/geos/algorithm/ttmath/ttmathtypes.h b/include/geos/algorithm/ttmath/ttmathtypes.h
index 3aaef4a..a6e4903 100644
--- a/include/geos/algorithm/ttmath/ttmathtypes.h
+++ b/include/geos/algorithm/ttmath/ttmathtypes.h
@@ -238,15 +238,21 @@ namespace ttmath
 		typedef unsigned __int64 uint;
 		typedef signed   __int64 sint;
 	#else
-		/*!
-			on 64bit platforms one word (uint, sint) will be equal 64bits
-		*/
-		typedef unsigned long uint;
+        #ifdef __MINGW64__
+            //Mingw64 64-bit patch from https://www.ttmath.org/forum/patch_for_building_64_bit_using_windows_mingw64_gcc
+            typedef uint64_t uint;
+            typedef int64_t sint;
+        #else
+            /*!
+            on 64bit platforms one word (uint, sint) will be equal 64bits
+            */
+            typedef unsigned long uint;
+            /*!
+                on 64bit platforms one word (uint, sint) will be equal 64bits
+            */
+            typedef signed long sint;
+        #endif
 
-		/*!
-			on 64bit platforms one word (uint, sint) will be equal 64bits
-		*/
-		typedef signed   long sint;
 	#endif
 
 	/*!

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

Summary of changes:
 include/geos/algorithm/ttmath/ttmathtypes.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GEOS