aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2022-09-12 17:35:04 +0200
committerJay Berkenbilt <ejb@ql.org>2022-09-12 17:48:38 +0200
commit4963ce6a533fdb423f00a13f0e15f96b33325f18 (patch)
tree722340e49b02f0e8314aeba3d78ea7c7e936265f /libqpdf
parent1393f56e7c2432452d59338a4078f8f3435a957e (diff)
downloadqpdf-4963ce6a533fdb423f00a13f0e15f96b33325f18.tar.zst
Remove obsolete LL_FMT check from build (fixes #768)
This was broken for cross-compilation and has probably been unnecessary for several years now. Also fix extraneous whitespace in related some tests.
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/CMakeLists.txt22
-rw-r--r--libqpdf/qpdf/qpdf-config.h.in3
2 files changed, 0 insertions, 25 deletions
diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt
index 1323e60c..7053e205 100644
--- a/libqpdf/CMakeLists.txt
+++ b/libqpdf/CMakeLists.txt
@@ -361,24 +361,6 @@ if(LFS_WITH_MACROS AND NOT LFS_WITHOUT_MACROS)
set(_FILE_OFFSET_BITS 64)
endif()
-function(qpdf_check_ll_fmt fmt var)
- if(NOT DEFINED LL_FMT)
- check_c_source_runs(
- "#define _CRT_SECURE_NO_WARNINGS
-#include <stdio.h>
-#include <string.h>
-int main(int argc, char* argv[]) {
- long long int a = 123456789012345ll;
- char s[30];
- sprintf(s, \"${fmt}\", a);
- return (strcmp(s, \"123456789012345\") == 0) ? 0 : 1;
-}" ${var})
- if(${var})
- set(LL_FMT "${fmt}" PARENT_SCOPE)
- endif()
- endif()
-endfunction()
-
check_c_source_compiles(
"#include <malloc.h>
#include <stdio.h>
@@ -402,10 +384,6 @@ int main(int argc, char* argv[]) {
}"
HAVE_OPEN_MEMSTREAM)
-qpdf_check_ll_fmt("%lld" fmt_lld)
-qpdf_check_ll_fmt("%I64d" fmt_i64d)
-qpdf_check_ll_fmt("%I64lld" fmt_i64lld)
-
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/qpdf/qpdf-config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/qpdf/qpdf-config.h"
diff --git a/libqpdf/qpdf/qpdf-config.h.in b/libqpdf/qpdf/qpdf-config.h.in
index 500f55cc..691a27e6 100644
--- a/libqpdf/qpdf/qpdf-config.h.in
+++ b/libqpdf/qpdf/qpdf-config.h.in
@@ -24,9 +24,6 @@
#cmakedefine HAVE_MALLOC_INFO 1
#cmakedefine HAVE_OPEN_MEMSTREAM 1
-/* printf format for long long */
-#cmakedefine LL_FMT "${LL_FMT}"
-
/* system random device (e.g. /dev/random) if any */
#cmakedefine RANDOM_DEVICE "${RANDOM_DEVICE}"