From 0197c61735472cc83105778f3a61caf19402f65b Mon Sep 17 00:00:00 2001
From: shattered <shattered@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Thu, 29 Apr 2004 19:00:36 +0000
Subject: [PATCH] In NetBSD-current newer than 30.12.2003, <dev/ata/atareg.h>
 contains conflicting definition for struct ata_smart_selftestlog.  Install a
 workaround.

Tested on 2.0E and 1.6.2.


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1693 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 sm5/os_netbsd.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sm5/os_netbsd.h b/sm5/os_netbsd.h
index 01b84eed2..58a81b356 100644
--- a/sm5/os_netbsd.h
+++ b/sm5/os_netbsd.h
@@ -24,17 +24,22 @@
 #ifndef OS_NETBSD_H_
 #define OS_NETBSD_H_
 
-#define OS_NETBSD_H_CVSID "$Id: os_netbsd.h,v 1.6 2004/03/30 20:12:11 shattered Exp $\n"
+#define OS_NETBSD_H_CVSID "$Id: os_netbsd.h,v 1.7 2004/04/29 19:00:36 shattered Exp $\n"
 
+#include <sys/device.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
+
+#include <sys/scsiio.h>
+#include <sys/ataio.h>
+
+#define ata_smart_selftestlog __netbsd_ata_smart_selftestlog
 #include <dev/ata/atareg.h>
 #if HAVE_DEV_ATA_ATAVAR_H
 #include <dev/ata/atavar.h>
 #endif
 #include <dev/ic/wdcreg.h>
-#include <sys/ataio.h>
-#include <sys/scsiio.h>
+#undef ata_smart_selftestlog
 
 #include <err.h>
 #include <fcntl.h>
-- 
GitLab