]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
cls,rados,rbd,mds,common: Avoid name collision with Windows headers
authorLucian Petrut <lpetrut@cloudbasesolutions.com>
Tue, 5 May 2020 11:25:28 +0000 (11:25 +0000)
committerLucian Petrut <lpetrut@cloudbasesolutions.com>
Wed, 8 Jul 2020 06:38:39 +0000 (06:38 +0000)
commit2d221a3bd108308d2832dbc2403979a4e7d7e940
tree08623cc01499d1cf7a327ff3188dbe3daa0c32f9
parentd53728272c5e8e9f222a7aae607c2200c790a112
cls,rados,rbd,mds,common: Avoid name collision with Windows headers

There are a few name collisions between Windows headers and ceph.
Where possible, we'll update Ceph code to avoid redefinitions.

The following names overlap with Windows headers:
* ERROR, NO_ERROR
* DELETE
* LocalLock
* LOCK_SHARED, LOCK_EXCLUSIVE

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
39 files changed:
src/cls/lock/cls_lock_client.cc
src/cls/lock/cls_lock_ops.cc
src/cls/lock/cls_lock_ops.h
src/cls/lock/cls_lock_types.cc
src/cls/lock/cls_lock_types.h
src/include/compat.h
src/librados/librados_cxx.cc
src/libradosstriper/RadosStriperImpl.cc
src/librbd/ManagedLock.cc
src/librbd/ObjectMap.cc
src/librbd/image/RefreshRequest.cc
src/librbd/internal.cc
src/librbd/managed_lock/AcquireRequest.cc
src/librbd/managed_lock/GetLockerRequest.cc
src/librbd/managed_lock/ReacquireRequest.cc
src/librbd/object_map/LockRequest.cc
src/librbd/object_map/RefreshRequest.cc
src/librbd/object_map/ResizeRequest.cc
src/librbd/object_map/SnapshotCreateRequest.cc
src/librbd/object_map/SnapshotRemoveRequest.cc
src/librbd/object_map/SnapshotRollbackRequest.cc
src/librbd/object_map/UpdateRequest.cc
src/mds/CDentry.h
src/mds/CInode.h
src/mds/LocalLock.h [deleted file]
src/mds/LocalLockC.h [new file with mode: 0644]
src/mds/Locker.cc
src/mds/Locker.h
src/osd/osd_types.h
src/test/cls_lock/test_cls_lock.cc
src/test/librbd/managed_lock/test_mock_AcquireRequest.cc
src/test/librbd/managed_lock/test_mock_GetLockerRequest.cc
src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc
src/test/librbd/test_ImageWatcher.cc
src/test/librbd/test_internal.cc
src/tools/rados/rados.cc
src/tools/rbd/ArgumentTypes.cc
src/tools/rbd/ArgumentTypes.h
src/tools/rbd/action/Journal.cc