aboutsummaryrefslogtreecommitdiff
path: root/src/sgp_dd.c
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2014-12-30 17:43:43 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2014-12-30 17:43:43 +0000
commit28a9dd72d6c5297f8a1442e23b80c165ba0b8486 (patch)
tree884f4e8f053d22228e96152cd3e7a3d05d30e494 /src/sgp_dd.c
parentb9d3507d55b42f80615e79ee268f875bc9b56a41 (diff)
downloadsg3_utils-28a9dd72d6c5297f8a1442e23b80c165ba0b8486.tar.gz
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
Diffstat (limited to 'src/sgp_dd.c')
-rw-r--r--src/sgp_dd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sgp_dd.c b/src/sgp_dd.c
index 40b7350c..3dad4b49 100644
--- a/src/sgp_dd.c
+++ b/src/sgp_dd.c
@@ -56,7 +56,7 @@
#include "sg_io_linux.h"
-static const char * version_str = "5.47 20140516";
+static const char * version_str = "5.48 20141226";
#define DEF_BLOCK_SIZE 512
#define DEF_BLOCKS_PER_TRANSFER 128
@@ -541,7 +541,7 @@ read_write_thread(void * v_clp)
#endif
if (NULL == (rep->alloc_bp = (unsigned char *)malloc(sz + psz)))
err_exit(ENOMEM, "out of memory creating user buffers\n");
- rep->buffp = (unsigned char *)(((unsigned long)rep->alloc_bp + psz - 1) &
+ rep->buffp = (unsigned char *)(((uintptr_t)rep->alloc_bp + psz - 1) &
(~(psz - 1)));
/* Follow clp members are constant during lifetime of thread */
rep->bs = clp->bs;