From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 3 Feb 2017 19:48:42 +0000 (-0500)
Subject: [librados,libcephfs] Avoid redefinition of rados_t
X-Git-Tag: v12.0.1~478^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd3bb7060b16e319308ef48f81beae0a1c5f616b;p=ceph.git

[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 1e690e7e22fc..dfb31a1007b8 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 87f42ceba292..8f88375d0000 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