Changeset: 072dba960caa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=072dba960caa Modified Files: NT/monetdb_config.h.in configure.ag gdk/gdk_calc_private.h Branch: int128 Log Message:
fixed (u)hge definition in case we have __int128_t / __uint128_t, but not (unsigned) __int128 diffs (48 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -680,6 +680,9 @@ /* Define to 1 if the system has the type `__int128_t'. */ /* #undef HAVE___INT128_T */ +/* Define to 1 if the system has the type `__uint128_t'. */ +/* #undef HAVE___UINT128_T */ + /* Define to 1 if the system has the type `__int64'. */ #define HAVE___INT64 1 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -2590,7 +2590,7 @@ AC_TYPE_SSIZE_T AC_TYPE_PID_T AC_TYPE_OFF_T -AC_CHECK_TYPES([__int64, long long, __int128, __int128_t]) +AC_CHECK_TYPES([__int64, long long, __int128, __int128_t, __uint128_t]) AC_CHECK_TYPES([ptrdiff_t],,,[#include <stddef.h> #include <sys/types.h>]) AC_CHECK_TYPES(bool) @@ -3120,7 +3120,7 @@ typedef __int128 hge; # define HAVE_HGE 1 # define SIZEOF_HGE SIZEOF___INT128 #else -# ifdef HAVE___INT128_T +# if defined(HAVE___INT128_T) && defined(HAVE___UINT128_T) typedef __int128_t hge; # define HAVE_HGE 1 # define SIZEOF_HGE SIZEOF___INT128_T diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h --- a/gdk/gdk_calc_private.h +++ b/gdk/gdk_calc_private.h @@ -29,8 +29,8 @@ typedef unsigned __int64 ulng; #ifdef HAVE___INT128 typedef unsigned __int128 uhge; #else -#ifdef HAVE___INT128_T -typedef unsigned __int128_t uhge; +#ifdef HAVE___UINT128_T +typedef __uint128_t uhge; #endif #endif #endif _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
