aboutsummaryrefslogtreecommitdiff
path: root/src/sg_raw.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/sg_raw.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/sg_raw.c')
-rw-r--r--src/sg_raw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sg_raw.c b/src/sg_raw.c
index 2580b080..90d4fc50 100644
--- a/src/sg_raw.c
+++ b/src/sg_raw.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <string.h>
#include <getopt.h>
+#include <inttypes.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -27,7 +28,7 @@
#include "sg_lib.h"
#include "sg_pt.h"
-#define SG_RAW_VERSION "0.4.11 (2014-10-18)"
+#define SG_RAW_VERSION "0.4.12 (2014-12-27)"
#ifdef SG_LIB_WIN32
#ifndef HAVE_SYSCONF
@@ -300,7 +301,7 @@ my_memalign(int length, unsigned char ** wrkBuffp)
return NULL;
} else if (wrkBuffp)
*wrkBuffp = wrkBuff;
- return (unsigned char *)(((unsigned long)wrkBuff + psz - 1) &
+ return (unsigned char *)(((uintptr_t)wrkBuff + psz - 1) &
(~(psz - 1)));
}
#endif