aboutsummaryrefslogtreecommitdiff
path: root/src/sg_dd.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sg_dd.c')
-rw-r--r--src/sg_dd.c10
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: "