From 98862acaa789e941329f6fed37665c87c670da0c Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 2 Feb 2018 03:22:51 -0800 Subject: [PATCH] include/ofi_: Adjust defines in renamed header files Convert _FI_XXX_H_ defines to reflect updated file names. Signed-off-by: Sean Hefty --- include/ofi.h | 6 +++--- include/ofi_abi.h | 6 +++--- include/ofi_atom.h | 6 +++--- include/ofi_enosys.h | 6 +++--- include/ofi_file.h | 6 +++--- include/ofi_indexer.h | 6 +++--- include/ofi_iov.h | 6 +++--- include/ofi_list.h | 6 +++--- include/ofi_lock.h | 6 +++--- include/ofi_mem.h | 6 +++--- include/ofi_osd.h | 6 +++--- include/ofi_proto.h | 6 +++--- include/ofi_prov.h | 6 +++--- include/ofi_rbuf.h | 6 +++--- include/ofi_shm.h | 6 +++--- include/ofi_signal.h | 6 +++--- include/ofi_util.h | 6 +++--- 17 files changed, 51 insertions(+), 51 deletions(-) diff --git a/include/ofi.h b/include/ofi.h index ca5db5d1831..c664fb9175b 100644 --- a/include/ofi.h +++ b/include/ofi.h @@ -31,8 +31,8 @@ * SOFTWARE. */ -#ifndef _FI_H_ -#define _FI_H_ +#ifndef _OFI_H_ +#define _OFI_H_ #include "config.h" @@ -207,4 +207,4 @@ static inline uint64_t ofi_key2idx(struct ofi_key_idx *key_idx, uint64_t key) } #endif -#endif /* _FI_H_ */ +#endif /* _OFI_H_ */ diff --git a/include/ofi_abi.h b/include/ofi_abi.h index bfc42e66688..cd028669705 100644 --- a/include/ofi_abi.h +++ b/include/ofi_abi.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_ABI_H_ -#define _FI_ABI_H_ +#ifndef _OFI_ABI_H_ +#define _OFI_ABI_H_ #include "config.h" @@ -169,4 +169,4 @@ struct fi_cq_err_entry_1_0 { } #endif -#endif /* _FI_ABI_H_ */ +#endif /* _OFI_ABI_H_ */ diff --git a/include/ofi_atom.h b/include/ofi_atom.h index cb5916fbe36..c4377b9769b 100644 --- a/include/ofi_atom.h +++ b/include/ofi_atom.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_ATOM_H_ -#define _FI_ATOM_H_ +#ifndef _OFI_ATOM_H_ +#define _OFI_ATOM_H_ #include "config.h" @@ -266,4 +266,4 @@ OFI_ATOMIC_DEFINE(64) } #endif -#endif /* _FI_ATOM_H_ */ +#endif /* _OFI_ATOM_H_ */ diff --git a/include/ofi_enosys.h b/include/ofi_enosys.h index dbcf0aab0ea..58029356c15 100644 --- a/include/ofi_enosys.h +++ b/include/ofi_enosys.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_ENOSYS_H_ -#define _FI_ENOSYS_H_ +#ifndef _OFI_ENOSYS_H_ +#define _OFI_ENOSYS_H_ #include @@ -458,4 +458,4 @@ int fi_no_av_remove(struct fid_av *av, fi_addr_t *fi_addr, size_t count, } #endif -#endif /* _FI_ENOSYS_H_ */ +#endif /* _OFI_ENOSYS_H_ */ diff --git a/include/ofi_file.h b/include/ofi_file.h index c7a00e0d0dc..46680ea7481 100644 --- a/include/ofi_file.h +++ b/include/ofi_file.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_FILE_H_ -#define _FI_FILE_H_ +#ifndef _OFI_FILE_H_ +#define _OFI_FILE_H_ #include "config.h" @@ -56,4 +56,4 @@ int fi_fd_nonblock(int fd); } #endif -#endif /* _FI_FILE_H_ */ +#endif /* _OFI_FILE_H_ */ diff --git a/include/ofi_indexer.h b/include/ofi_indexer.h index 12b94644a25..3dc7d070501 100644 --- a/include/ofi_indexer.h +++ b/include/ofi_indexer.h @@ -32,8 +32,8 @@ * */ -#if !defined(INDEXER_H) -#define INDEXER_H +#ifndef _OFI_INDEXER_H_ +#define _OFI_INDEXER_H_ #include "config.h" @@ -116,4 +116,4 @@ static inline void *ofi_idm_lookup(struct index_map *idm, int index) ofi_idm_at(idm, index) : NULL; } -#endif /* INDEXER_H */ +#endif /* _OFI_INDEXER_H_ */ diff --git a/include/ofi_iov.h b/include/ofi_iov.h index 1ae3f047855..545f33147e4 100644 --- a/include/ofi_iov.h +++ b/include/ofi_iov.h @@ -31,8 +31,8 @@ * */ -#if !defined(IOV_H) -#define IOV_H +#ifndef _OFI_IOV_H_ +#define _OFI_IOV_H_ #include "config.h" @@ -126,5 +126,5 @@ ofi_iov_within(const struct iovec *iov1, const struct iovec *iov2) (ofi_iov_end(iov1) <= ofi_iov_end(iov2)); } -#endif /* IOV_H */ +#endif /* _OFI_IOV_H_ */ diff --git a/include/ofi_list.h b/include/ofi_list.h index 8d5afc275b7..07970716e02 100644 --- a/include/ofi_list.h +++ b/include/ofi_list.h @@ -32,8 +32,8 @@ * */ -#ifndef _FI_LIST_H_ -#define _FI_LIST_H_ +#ifndef _OFI_LIST_H_ +#define _OFI_LIST_H_ #include "config.h" @@ -367,4 +367,4 @@ static inline int dlistfd_wait_avail(struct dlistfd_head *head, int timeout) return ret ? ret : !dlistfd_empty(head); } -#endif /* _FI_LIST_H_ */ +#endif /* _OFI_LIST_H_ */ diff --git a/include/ofi_lock.h b/include/ofi_lock.h index 30a83da7c36..9fc7f400ae0 100644 --- a/include/ofi_lock.h +++ b/include/ofi_lock.h @@ -31,8 +31,8 @@ * SOFTWARE. */ -#ifndef _FI_LOCK_H_ -#define _FI_LOCK_H_ +#ifndef _OFI_LOCK_H_ +#define _OFI_LOCK_H_ #include "config.h" @@ -138,4 +138,4 @@ static inline void fastlock_release(fastlock_t *lock) } #endif -#endif /* _FI_LOCK_H_ */ +#endif /* _OFI_LOCK_H_ */ diff --git a/include/ofi_mem.h b/include/ofi_mem.h index 2f6c6127097..93c87ee5034 100644 --- a/include/ofi_mem.h +++ b/include/ofi_mem.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_MEM_H_ -#define _FI_MEM_H_ +#ifndef _OFI_MEM_H_ +#define _OFI_MEM_H_ #include @@ -358,4 +358,4 @@ extern uint64_t OFI_RMA_PMEM; extern void (*ofi_pmem_commit)(const void *addr, size_t len); -#endif /* _FI_MEM_H_ */ +#endif /* _OFI_MEM_H_ */ diff --git a/include/ofi_osd.h b/include/ofi_osd.h index 225ea5fce05..432d8096092 100644 --- a/include/ofi_osd.h +++ b/include/ofi_osd.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_OSD_H_ -#define _FI_OSD_H_ +#ifndef _OFI_OSD_H_ +#define _OFI_OSD_H_ /* We use macros to create atomic and complex function definitions, @@ -76,4 +76,4 @@ typedef long double long_double; #define OFI_UNLIKELY(x) (x) #endif -#endif /* _FI_OSD_H_ */ +#endif /* _OFI_OSD_H_ */ diff --git a/include/ofi_proto.h b/include/ofi_proto.h index fec3ddbf730..5a569b1d8a0 100644 --- a/include/ofi_proto.h +++ b/include/ofi_proto.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_PROTO_H_ -#define _FI_PROTO_H_ +#ifndef _OFI_PROTO_H_ +#define _OFI_PROTO_H_ #include "config.h" @@ -193,4 +193,4 @@ struct ofi_rma_ioc { } #endif -#endif /* _FI_PROTO_H_ */ +#endif /* _OFI_PROTO_H_ */ diff --git a/include/ofi_prov.h b/include/ofi_prov.h index b3269c92eaa..68281b880da 100644 --- a/include/ofi_prov.h +++ b/include/ofi_prov.h @@ -31,8 +31,8 @@ * SOFTWARE. */ -#ifndef _PROV_H_ -#define _PROV_H_ +#ifndef _OFI_PROV_H_ +#define _OFI_PROV_H_ #include "config.h" @@ -206,4 +206,4 @@ SHM_INI ; # define SHM_INIT NULL #endif -#endif /* _PROV_H_ */ +#endif /* _OFI_PROV_H_ */ diff --git a/include/ofi_rbuf.h b/include/ofi_rbuf.h index 7427e1efb68..6fb721d647f 100644 --- a/include/ofi_rbuf.h +++ b/include/ofi_rbuf.h @@ -32,8 +32,8 @@ * */ -#if !defined(FI_RBUF_H) -#define FI_RBUF_H +#ifndef _OFI_RBUF_H_ +#define _OFI_RBUF_H_ #include "config.h" @@ -352,4 +352,4 @@ static inline size_t ofi_rbfdwait(struct ofi_ringbuffd *rbfd, int timeout) } -#endif /* FI_RBUF_H */ +#endif /* _OFI_RBUF_H_ */ diff --git a/include/ofi_shm.h b/include/ofi_shm.h index 7c50a94f5ac..94efb1af39b 100644 --- a/include/ofi_shm.h +++ b/include/ofi_shm.h @@ -30,8 +30,8 @@ * SOFTWARE. */ -#ifndef _FI_SHM_H_ -#define _FI_SHM_H_ +#ifndef _OFI_SHM_H_ +#define _OFI_SHM_H_ #include "config.h" @@ -260,4 +260,4 @@ void smr_free(struct smr_region *smr); } #endif -#endif /* _FI_SHM_H_ */ +#endif /* _OFI_SHM_H_ */ diff --git a/include/ofi_signal.h b/include/ofi_signal.h index 6a1e6d71348..3a2974f893d 100644 --- a/include/ofi_signal.h +++ b/include/ofi_signal.h @@ -31,8 +31,8 @@ * */ -#ifndef _FI_SIGNAL_H_ -#define _FI_SIGNAL_H_ +#ifndef _OFI_SIGNAL_H_ +#define _OFI_SIGNAL_H_ #include "config.h" @@ -183,4 +183,4 @@ void fi_epoll_close(struct fi_epoll *ep); #endif /* HAVE_EPOLL */ -#endif /* _FI_SIGNAL_H_ */ +#endif /* _OFI_SIGNAL_H_ */ diff --git a/include/ofi_util.h b/include/ofi_util.h index f09693ccbdd..7e3abb9e7a0 100644 --- a/include/ofi_util.h +++ b/include/ofi_util.h @@ -31,8 +31,8 @@ * SOFTWARE. */ -#ifndef _FI_UTIL_H_ -#define _FI_UTIL_H_ +#ifndef _OFI_UTIL_H_ +#define _OFI_UTIL_H_ #if HAVE_CONFIG_H # include @@ -762,4 +762,4 @@ int ofi_ns_del_local_name(struct util_ns *ns, void *service, void *name); void *ofi_ns_resolve_name(struct util_ns *ns, const char *server, void *service); -#endif +#endif /* _OFI_UTIL_H_ */