diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-13 16:06:46 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-01-26 21:27:38 +0200 |
| commit | 245cbc655bd26e8de57809bc109b82105a30693d (patch) | |
| tree | 886ca0cc02f2ad94c3e3a96831b4ae8c42167844 /usr/src | |
| parent | 9868091de5a69073a55e3b8cc1a378cac9220edf (diff) | |
| download | illumos-gate-245cbc655bd26e8de57809bc109b82105a30693d.tar.gz | |
13430 scsi_vhci: multiply-defined symbols
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/sys/mhd.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/uts/common/sys/mhd.h b/usr/src/uts/common/sys/mhd.h index 66d57266ad..3d7e0d5d5a 100644 --- a/usr/src/uts/common/sys/mhd.h +++ b/usr/src/uts/common/sys/mhd.h @@ -27,8 +27,6 @@ #ifndef _SYS_MHD_H #define _SYS_MHD_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -41,8 +39,8 @@ extern "C" { #define MHIOCTKOWN (MHIOC|2) #define MHIOCRELEASE (MHIOC|3) #define MHIOCSTATUS (MHIOC|4) -#define MHIOCGRP_INKEYS (MHIOC|5) -#define MHIOCGRP_INRESV (MHIOC|6) +#define MHIOCGRP_INKEYS (MHIOC|5) +#define MHIOCGRP_INRESV (MHIOC|6) #define MHIOCGRP_REGISTER (MHIOC|7) #define MHIOCGRP_RESERVE (MHIOC|8) #define MHIOCGRP_PREEMPTANDABORT (MHIOC|9) @@ -79,13 +77,13 @@ typedef struct mhioc_inkeys { } mhioc_inkeys_t; #if defined(_SYSCALL32) -struct mhioc_key_list32 { +typedef struct mhioc_key_list32 { uint32_t listsize; uint32_t listlen; caddr32_t list; } mhioc_key_list32_t; -struct mhioc_inkeys32 { +typedef struct mhioc_inkeys32 { uint32_t generation; caddr32_t li; } mhioc_inkeys32_t; @@ -110,7 +108,7 @@ typedef struct mhioc_inresvs { } mhioc_inresvs_t; #if defined(_SYSCALL32) -struct mhioc_resv_desc_list32 { +typedef struct mhioc_resv_desc_list32 { uint32_t listsize; uint32_t listlen; caddr32_t list; |