diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2018-08-25 22:01:29 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2018-09-01 14:38:12 +0000 |
| commit | 9b5d56054c4bd28cc94ec634db3905aff0480a92 (patch) | |
| tree | 7c0c9fd61d75c7b00884d9ac9095df598205ff00 | |
| parent | f3b38739d507e5ba3c9d8b728fe581f30d4463f8 (diff) | |
| download | strace-9b5d56054c4bd28cc94ec634db3905aff0480a92.tar.gz | |
Decode BLKGETSIZE64 unconditionally
It is available on all supported kernel versions.
* block.c (block_ioctl): Remove #ifdef HAVE_BLKGETSIZE64.
* configure.ac: Remove BLKGETSIZE64 check.
| -rw-r--r-- | block.c | 2 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 0 insertions, 11 deletions
@@ -204,7 +204,6 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp, printnum_ulong(tcp, arg); break; -#ifdef HAVE_BLKGETSIZE64 /* returns an uint64_t */ case BLKGETSIZE64: if (entering(tcp)) @@ -212,7 +211,6 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp, tprints(", "); printnum_int64(tcp, arg, "%" PRIu64); break; -#endif /* takes a pair of uint64_t */ case BLKDISCARD: diff --git a/configure.ac b/configure.ac index ad1d00fbc..c982ced10 100644 --- a/configure.ac +++ b/configure.ac @@ -788,15 +788,6 @@ AC_CHECK_MEMBERS(m4_normalize([ #include <linux/types.h> #include <linux/videodev2.h>]) -AC_CACHE_CHECK([for BLKGETSIZE64], [ac_cv_have_blkgetsize64], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -#include <stdlib.h> -#include <linux/fs.h>], [return !BLKGETSIZE64;])], - [ac_cv_have_blkgetsize64=yes], [ac_cv_have_blkgetsize64=no])] - if test $ac_cv_have_blkgetsize64 = yes; then - AC_DEFINE([HAVE_BLKGETSIZE64], [1], [Define to 1 if you have BLKGETSIZE64.]) - fi) - AC_CHECK_SIZEOF([long]) SIZEOF_LONG="$ac_cv_sizeof_long" AC_SUBST(SIZEOF_LONG) |