From 9a9577a3b7f0b0c82ad0e77b9f16b3afa238322c Mon Sep 17 00:00:00 2001
From: Douglas Gilbert <dgilbert@interlog.com>
Date: Sun, 22 Oct 2017 17:32:39 +0000
Subject: sg_lib: add sg_ll_log_sense_v2(), sg_ll_mode_sense10_v2() and
 sg_ll_receive_diag_v2(); documentation cleanup; sg_ses: filter join output on
 dpage element presence (AES dpage)

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@722 6180dd3e-e324-4e3e-922d-17de1ae2f315
---
 src/sg_dd.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/sg_dd.c')

diff --git a/src/sg_dd.c b/src/sg_dd.c
index 97a6f77e..7bb5eedf 100644
--- a/src/sg_dd.c
+++ b/src/sg_dd.c
@@ -44,13 +44,15 @@
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <sys/time.h>
 #include <sys/file.h>
-#include <linux/major.h>
+#include <sys/sysmacros.h>
+#ifndef major
+#include <sys/types.h>
+#endif
 #include <linux/fs.h>   /* <sys/mount.h> */
+#include <linux/major.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-- 
cgit v1.2.3