From 0d92b6b342959ce1b7528087f066bdada2e4aefb Mon Sep 17 00:00:00 2001 From: Daniel Jared Dominguez Date: Mon, 7 Jul 2014 20:50:50 -0500 Subject: [PATCH 13/22] Clang uses C99 semantics by default for inline keyword. It's most straightforward not to state get_scsi_idlun is inline. Signed-off-by: Daniel Jared Dominguez --- src/include/scsi_ioctls.h | 2 +- src/lib/scsi_ioctls.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/scsi_ioctls.h b/src/include/scsi_ioctls.h index 995cbbd..331bb14 100644 --- a/src/include/scsi_ioctls.h +++ b/src/include/scsi_ioctls.h @@ -39,7 +39,7 @@ typedef struct scsi_idlun { int get_nvme_ns_id(int fd, uint32_t *ns_id); -inline int get_scsi_idlun(int fd, Scsi_Idlun *idlun); +int get_scsi_idlun(int fd, Scsi_Idlun *idlun); int get_scsi_pci(int fd, char *slot_name, size_t size); int idlun_to_components (Scsi_Idlun *idlun, unsigned char *host, diff --git a/src/lib/scsi_ioctls.c b/src/lib/scsi_ioctls.c index e013a6f..c04f12a 100644 --- a/src/lib/scsi_ioctls.c +++ b/src/lib/scsi_ioctls.c @@ -50,7 +50,7 @@ idlun_to_components (Scsi_Idlun *idlun, } -inline int +int get_scsi_idlun(int fd, Scsi_Idlun *idlun) { return ioctl(fd, SCSI_IOCTL_GET_IDLUN, idlun); -- 1.9.3