diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2013-11-11 15:52:37 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2013-11-11 15:58:20 +0000 |
| commit | 18bce8c23a284fb684bb48c92ccce7dcfd5edb0d (patch) | |
| tree | de508fab154b22991373a824a2418e71bab54f5a | |
| parent | d64a7e4755abe2d073676741f38328aa0b83db9f (diff) | |
| download | strace-18bce8c23a284fb684bb48c92ccce7dcfd5edb0d.tar.gz strace-18bce8c23a284fb684bb48c92ccce7dcfd5edb0d.tar.bz2 strace-18bce8c23a284fb684bb48c92ccce7dcfd5edb0d.tar.xz | |
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.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | file.c | 12 |
2 files changed, 0 insertions, 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 <sys/types.h> #include <sys/socket.h> #include <netinet/in.h>]) -AC_CHECK_TYPES([long long]) AC_LITTLE_ENDIAN_LONG_LONG AC_OFF_T_IS_LONG_LONG AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>]) @@ -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)) { |