From: Kornel Benko <kornel@lyx.org>
Date: Thu, 21 Mar 2019 15:12:02 +0000 (+0100)
Subject: CMake build: Rename HAVE_LONG_LONG to HAVE_LONG_LONG_INT
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2409
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4da338e5505f997564f8854fa5df1bd8ce0058ca;p=features.git

CMake build: Rename HAVE_LONG_LONG to HAVE_LONG_LONG_INT
---

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 5550a7352b..1b6bf45bd0 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -68,7 +68,7 @@ check_type_size(intmax_t HAVE_INTMAX_T)
 macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX)
 
 check_type_size("long double"  HAVE_LONG_DOUBLE)
-check_type_size("long long"  HAVE_LONG_LONG)
+check_type_size("long long"  HAVE_LONG_LONG_INT)
 check_type_size(wchar_t HAVE_WCHAR_T)
 check_type_size(wint_t  HAVE_WINT_T)
 
diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index 9aed6e2bc2..ee8a977be2 100644
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -32,7 +32,7 @@
 #cmakedefine CXX_GLOBAL_CSTD 1
 #cmakedefine HAVE_WPRINTF 1
 #cmakedefine HAVE_LONG_DOUBLE 1
-#cmakedefine HAVE_LONG_LONG 1
+#cmakedefine HAVE_LONG_LONG_INT 1
 #cmakedefine HAVE_WCHAR_T 1
 #cmakedefine HAVE_WINT_T 1
 #cmakedefine HAVE_STDINT_H_WITH_UINTMAX 1
@@ -52,12 +52,6 @@
 #  endif
 #endif
 
-#ifdef HAVE_LONG_LONG
-#ifdef SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG
-#define HAVE_LONG_LONG_INT 1
-#endif
-#endif
-
 #cmakedefine GETTEXT_FOUND 1
 
 #cmakedefine HAVE_ALLOCA 1