diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-06-17 14:16:18 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-06-17 14:20:53 -0700 |
| commit | 47ce702ce6230f2404bf0b1cb051d78489537469 (patch) | |
| tree | ccd2f84d808d673d7b99a3799165f9e8c015e786 | |
| parent | 5cf5f18e3d5521007d57c406fdd13ca626926f1c (diff) | |
| download | ceph-47ce702ce6230f2404bf0b1cb051d78489537469.tar.gz | |
*: always include rados.h using types.h
types.h redefines __le* to ceph_le* to ensure endian
safety.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/cls/rbd/cls_rbd_client.h | 1 | ||||
| -rw-r--r-- | src/key_value_store/kv_flat_btree_async.cc | 1 | ||||
| -rw-r--r-- | src/key_value_store/kv_flat_btree_async.h | 2 | ||||
| -rw-r--r-- | src/librados/IoCtxImpl.h | 3 | ||||
| -rw-r--r-- | src/os/hobject.h | 1 | ||||
| -rw-r--r-- | src/test/cls_rbd/test_cls_rbd.cc | 3 |
6 files changed, 3 insertions, 8 deletions
diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h index c1d421a43a8..34cc45b8390 100644 --- a/src/cls/rbd/cls_rbd_client.h +++ b/src/cls/rbd/cls_rbd_client.h @@ -6,7 +6,6 @@ #include "cls/lock/cls_lock_types.h" #include "common/snap_types.h" -#include "include/rados.h" #include "include/rados/librados.hpp" #include "include/types.h" #include "librbd/parent_types.h" diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc index 68e1eab6b84..b055ad34141 100644 --- a/src/key_value_store/kv_flat_btree_async.cc +++ b/src/key_value_store/kv_flat_btree_async.cc @@ -20,7 +20,6 @@ #include "common/ceph_context.h" #include "global/global_context.h" #include "common/Clock.h" -#include "include/rados.h" #include "include/types.h" diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h index 132d7987492..e0f09bd5c94 100644 --- a/src/key_value_store/kv_flat_btree_async.h +++ b/src/key_value_store/kv_flat_btree_async.h @@ -20,7 +20,7 @@ #include "key_value_store/key_value_structure.h" #include "include/utime.h" -#include "include/rados.h" +#include "include/types.h" #include "include/encoding.h" #include "common/Mutex.h" #include "common/Clock.h" diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h index 7e589a82f50..74ca1d09880 100644 --- a/src/librados/IoCtxImpl.h +++ b/src/librados/IoCtxImpl.h @@ -19,10 +19,9 @@ #include "common/Mutex.h" #include "common/snap_types.h" #include "include/atomic.h" -#include "include/rados.h" +#include "include/types.h" #include "include/rados/librados.h" #include "include/rados/librados.hpp" -#include "include/types.h" #include "include/xlist.h" #include "osd/osd_types.h" #include "osdc/Objecter.h" diff --git a/src/os/hobject.h b/src/os/hobject.h index 47fcb3dda39..3c1b0efee44 100644 --- a/src/os/hobject.h +++ b/src/os/hobject.h @@ -17,7 +17,6 @@ #include <string.h> #include "include/types.h" -#include "include/rados.h" #include "include/object.h" #include "include/cmp.h" diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index c147b43f4cb..c7ea79d81d9 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -3,9 +3,8 @@ #include "common/snap_types.h" #include "include/encoding.h" -#include "include/rados.h" -#include "include/rados/librados.h" #include "include/types.h" +#include "include/rados/librados.h" #include "cls/rbd/cls_rbd.h" #include "cls/rbd/cls_rbd_client.h" |