From bd3bb7060b16e319308ef48f81beae0a1c5f616b Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Fri, 3 Feb 2017 14:48:42 -0500 Subject: [PATCH] [librados,libcephfs] Avoid redefinition of rados_t Signed-off-by: Adam C. Emerson --- src/include/cephfs/libcephfs.h | 3 +++ src/include/rados/librados.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/include/cephfs/libcephfs.h b/src/include/cephfs/libcephfs.h index 1e690e7e22f..dfb31a1007b 100644 --- a/src/include/cephfs/libcephfs.h +++ b/src/include/cephfs/libcephfs.h @@ -208,7 +208,10 @@ int ceph_create(struct ceph_mount_info **cmount, const char * const id); int ceph_create_with_context(struct ceph_mount_info **cmount, struct CephContext *conf); +#ifndef VOIDPTR_RADOS_T +#define VOIDPTR_RADOS_T typedef void *rados_t; +#endif // VOIDPTR_RADOS_T /** * Create a mount handle from a rados_t, for using libcephfs in the diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h index 87f42ceba29..8f88375d000 100644 --- a/src/include/rados/librados.h +++ b/src/include/rados/librados.h @@ -166,7 +166,10 @@ enum { * -- or to the same cluster with different users -- requires * different cluster handles. */ +#ifndef VOIDPTR_RADOS_T +#define VOIDPTR_RADOS_T typedef void *rados_t; +#endif //VOIDPTR_RADOS_T /** * @typedef rados_config_t