From 28a9dd72d6c5297f8a1442e23b80c165ba0b8486 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Tue, 30 Dec 2014 17:43:43 +0000 Subject: introduce uintptr_t in place of unsigned long, w7 64 bit requirement git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@625 6180dd3e-e324-4e3e-922d-17de1ae2f315 --- src/sg_read.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sg_read.c') diff --git a/src/sg_read.c b/src/sg_read.c index 0f102864..3fc0526c 100644 --- a/src/sg_read.c +++ b/src/sg_read.c @@ -48,7 +48,7 @@ #include "sg_io_linux.h" -static const char * version_str = "1.21 20140516"; +static const char * version_str = "1.22 20141227"; #define DEF_BLOCK_SIZE 512 #define DEF_BLOCKS_PER_TRANSFER 128 @@ -659,7 +659,7 @@ int main(int argc, char * argv[]) return SG_LIB_CAT_OTHER; } /* perhaps use posix_memalign() instead */ - wrkPos = (unsigned char *)(((unsigned long)wrkBuff + psz - 1) & + wrkPos = (unsigned char *)(((uintptr_t)wrkBuff + psz - 1) & (~(psz - 1))); } else if (do_mmap) { wrkPos = (unsigned char *)mmap(NULL, bs * bpt, -- cgit v1.2.3