[librados,libcephfs] Avoid redefinition of rados_t

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/include/cephfs/libcephfs.h b/src/include/cephfs/libcephfs.h
index 1e690e7e22fc53d75356e528720fc7aa77d64652..dfb31a1007b8e146cfd642a9262b4b0fc8b10633 100644 (file)
--- 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 87f42ceba292083b1a171ebecc4f3da5991edd6a..8f88375d00003dc45e87050284ca3b2a1aa74b2d 100644 (file)
--- 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