RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[librados,libcephfs] Avoid redefinition of rados_t

Browse Source 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Adam C. Emerson 2017-02-03 14:48:42 -05:00
parent b24e438b40
commit bd3bb7060b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/cephfs/libcephfs.h
View File

@ -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

3
src/include/rados/librados.h
View File

@ -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