]> git.proxmox.com Git - mirror_smartmontools-debian.git/blob - debian/patches/kfreebsd.patch
Merge tag 'upstream/6.3+svn3990'
[mirror_smartmontools-debian.git] / debian / patches / kfreebsd.patch
1 --- a/dev_areca.h
2 +++ b/dev_areca.h
3 @@ -58,7 +58,7 @@
4 #define ARCMSR_IOCTL_CLEAR_RQBUFFER (ARECA_SATA_RAID | FUNCTION_CLEAR_RQBUFFER)
5 #define ARCMSR_IOCTL_CLEAR_WQBUFFER (ARECA_SATA_RAID | FUNCTION_CLEAR_WQBUFFER)
6 #define ARCMSR_IOCTL_RETURN_CODE_3F (ARECA_SATA_RAID | FUNCTION_RETURN_CODE_3F)
7 -#elif defined(__FreeBSD__)
8 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
9 #include <sys/ioctl.h> // _IOWR
10
11 /*FunctionCode*/
12 --- a/cciss.cpp
13 +++ b/cciss.cpp
14 @@ -18,18 +18,10 @@
15 # ifndef be32toh
16 # define be32toh __be32_to_cpu
17 # endif
18 -#elif defined(__FreeBSD__)
19 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
20 # include <sys/endian.h>
21 # include CISS_LOCATION
22 # define _HAVE_CCISS
23 -#elif defined(__FreeBSD_kernel__)
24 -# include <endian.h>
25 -# ifdef __GLIBC__
26 -# include <bsd/sys/cdefs.h>
27 -# include <stdint.h>
28 -# endif
29 -# include CISS_LOCATION
30 -# define _HAVE_CCISS
31 #endif
32
33 #ifdef _HAVE_CCISS