From 18bce8c23a284fb684bb48c92ccce7dcfd5edb0d Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 11 Nov 2013 15:52:37 +0000 Subject: Assume "long long" availability Most of the code already uses long long types unconditionally. * configure.ac: Remove the check for long long. * file.c (printstat64): Remove HAVE_LONG_LONG checks, use %llu format string unconditionally. --- configure.ac | 1 - file.c | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/configure.ac b/configure.ac index 5b4c38e..62e20ce 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,6 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, [#include #include #include ]) -AC_CHECK_TYPES([long long]) AC_LITTLE_ENDIAN_LONG_LONG AC_OFF_T_IS_LONG_LONG AC_CHECK_TYPES([struct opthdr],,, [#include ]) diff --git a/file.c b/file.c index 016fc94..6feb947 100644 --- a/file.c +++ b/file.c @@ -1104,18 +1104,10 @@ printstat64(struct tcb *tcp, long addr) } if (!abbrev(tcp)) { -#ifdef HAVE_LONG_LONG tprintf("{st_dev=makedev(%lu, %lu), st_ino=%llu, st_mode=%s, ", -#else - tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ", -#endif (unsigned long) major(statbuf.st_dev), (unsigned long) minor(statbuf.st_dev), -#ifdef HAVE_LONG_LONG (unsigned long long) statbuf.st_ino, -#else - (unsigned long) statbuf.st_ino, -#endif sprintmode(statbuf.st_mode)); tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ", (unsigned long) statbuf.st_nlink, @@ -1144,11 +1136,7 @@ printstat64(struct tcb *tcp, long addr) #endif /* !HAVE_STRUCT_STAT_ST_RDEV */ break; default: -#ifdef HAVE_LONG_LONG tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size); -#else - tprintf("st_size=%lu, ", (unsigned long) statbuf.st_size); -#endif break; } if (!abbrev(tcp)) { -- cgit v1.2.3