diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-08-13 05:24:09 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-08-13 05:24:09 +0000 |
| commit | a059c857494382bb900dc23474b31c654017e461 (patch) | |
| tree | c8738fed0dc06aa9a0e0f1c6cf472166ff7255b9 /src/sg_dd.c | |
| parent | 9236f11e7389ec4658b06b3835ad4a6cceca9d50 (diff) | |
| download | sg3_utils-a059c857494382bb900dc23474b31c654017e461.tar.gz | |
apply most patches from sg3_utils-1.42-6.fc29.src*; sg_get_lba_status fixes; doco
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@786 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_dd.c')
| -rw-r--r-- | src/sg_dd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sg_dd.c b/src/sg_dd.c index 9dd5f2c1..edd8f9c3 100644 --- a/src/sg_dd.c +++ b/src/sg_dd.c @@ -48,9 +48,11 @@ #include <sys/time.h> #include <sys/file.h> #include <sys/sysmacros.h> -#include <sys/types.h> /* needed for lseek64() */ -#include <linux/fs.h> /* <sys/mount.h> */ -#include <linux/major.h> +#ifndef major +#include <sys/types.h> +#endif +#include <linux/major.h> /* for MEM_MAJOR, SCSI_GENERIC_MAJOR, etc */ +#include <linux/fs.h> /* for BLKSSZGET and friends */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,7 +64,7 @@ #include "sg_unaligned.h" #include "sg_pr2serr.h" -static const char * version_str = "6.03 20180723"; +static const char * version_str = "6.04 20180811"; #define ME "sg_dd: " |