ref: 7815050334f67b1bdf6ce11c22cdde1fe0e68e41
parent: 9e7748f55c971ae97399da544596f70feaee74d9
author: Werner Lemberg <[email protected]>
date: Thu Nov 17 07:00:20 EST 2016
Better support of LLP64 systems with gcc (and clang). * builds/unix/configure.raw: Call `AC_TYPE_LONG_LONG_INT'. * builds/unix/ftconfig.in (FT_LONG64): Enable for LLP64 systems (and suppress warnings) even without `FT_CONFIG_OPTION_FORCE_INT64'.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-17 Werner Lemberg <[email protected]>
+
+ Better support of LLP64 systems with gcc (and clang).
+
+ * builds/unix/configure.raw: Call `AC_TYPE_LONG_LONG_INT'.
+
+ * builds/unix/ftconfig.in (FT_LONG64): Enable for LLP64 systems (and
+ suppress warnings) even without `FT_CONFIG_OPTION_FORCE_INT64'.
+
2016-11-10 Werner Lemberg <[email protected]>
Fix `lcd_weights' array size.
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -105,6 +105,7 @@
AC_C_CONST
AC_CHECK_SIZEOF([int])
AC_CHECK_SIZEOF([long])
+AC_TYPE_LONG_LONG_INT
# check whether cpp computation of size of int and long in ftconfig.in works
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -287,8 +287,8 @@
#endif
- /* determine whether we have a 64-bit int type for platforms without */
- /* Autoconf */
+ /* determine whether we have a 64-bit int type */
+ /* (mostly for environments without `autoconf') */
#if FT_SIZEOF_LONG == 8
/* FT_LONG64 must be defined if a 64-bit type is available */
@@ -295,6 +295,16 @@
#define FT_LONG64
#define FT_INT64 long
#define FT_UINT64 unsigned long
+
+ /* we handle the LLP64 scheme separately for GCC and clang, */
+ /* suppressing the `long long' warning */
+#elif ( FT_SIZEOF_LONG == 4 ) && \
+ defined( HAVE_LONG_LONG_INT ) && \
+ defined( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wlong-long"
+#define FT_LONG64
+#define FT_INT64 long long int
+#define FT_UINT64 unsigned long long int
/*************************************************************************/
/* */