diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2010-06-12 15:04:11 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-06-17 10:47:37 -0700 |
| commit | f4b9d9d847627e2445cd8bd80c6b893cd9efcd30 (patch) | |
| tree | f8c0684d6c57a8025cafc1836cfd29f7ff416b01 | |
| parent | 6de2dde76253e56ef2dc7aa03ee709a519576dcb (diff) | |
| download | ceph-f4b9d9d847627e2445cd8bd80c6b893cd9efcd30.tar.gz | |
Bug #98: Unique names for include guards
A couple of preprocessor symbols for include guards tampered with the reserved namespace.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Sage Weil <sage@newdream.net>
310 files changed, 620 insertions, 620 deletions
diff --git a/src/active/common.h b/src/active/common.h index cdb3582a132..9b2742f8895 100644 --- a/src/active/common.h +++ b/src/active/common.h @@ -1,5 +1,5 @@ -#ifndef COMMON_H -#define COMMON_H +#ifndef CEPH_COMMON_H +#define CEPH_COMMON_H #include <sys/stat.h> diff --git a/src/auth/Auth.h b/src/auth/Auth.h index 0ff195875cf..1c73865918a 100644 --- a/src/auth/Auth.h +++ b/src/auth/Auth.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHTYPES_H -#define __AUTHTYPES_H +#ifndef CEPH_AUTHTYPES_H +#define CEPH_AUTHTYPES_H #include "Crypto.h" #include "msg/msg_types.h" diff --git a/src/auth/AuthAuthorizeHandler.h b/src/auth/AuthAuthorizeHandler.h index 76a9cc210de..47da2b4217f 100644 --- a/src/auth/AuthAuthorizeHandler.h +++ b/src/auth/AuthAuthorizeHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHAUTHORIZEHANDLER_H -#define __AUTHAUTHORIZEHANDLER_H +#ifndef CEPH_AUTHAUTHORIZEHANDLER_H +#define CEPH_AUTHAUTHORIZEHANDLER_H #include "include/types.h" #include "config.h" diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h index a7f0e1a1e85..9fd49d8b134 100644 --- a/src/auth/AuthClientHandler.h +++ b/src/auth/AuthClientHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHCLIENTHANDLER_H -#define __AUTHCLIENTHANDLER_H +#ifndef CEPH_AUTHCLIENTHANDLER_H +#define CEPH_AUTHCLIENTHANDLER_H #include "auth/Auth.h" diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h index 729f6404891..50cbd553a02 100644 --- a/src/auth/AuthServiceHandler.h +++ b/src/auth/AuthServiceHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHSERVICEHANDLER_H -#define __AUTHSERVICEHANDLER_H +#ifndef CEPH_AUTHSERVICEHANDLER_H +#define CEPH_AUTHSERVICEHANDLER_H #include "include/types.h" #include "config.h" diff --git a/src/auth/AuthSupported.h b/src/auth/AuthSupported.h index 5544e093f90..da12a8567bf 100644 --- a/src/auth/AuthSupported.h +++ b/src/auth/AuthSupported.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHSUPPORTED_H -#define __AUTHSUPPORTED_H +#ifndef CEPH_AUTHSUPPORTED_H +#define CEPH_AUTHSUPPORTED_H #include <map> diff --git a/src/auth/Crypto.h b/src/auth/Crypto.h index 28de69da2ff..782f3bb0a1c 100644 --- a/src/auth/Crypto.h +++ b/src/auth/Crypto.h @@ -11,8 +11,8 @@ * */ -#ifndef __CRYPTO_H -#define __CRYPTO_H +#ifndef CEPH_CRYPTO_H +#define CEPH_CRYPTO_H #include "include/types.h" diff --git a/src/auth/ExportControl.h b/src/auth/ExportControl.h index a0048f96319..25896fe9b4c 100644 --- a/src/auth/ExportControl.h +++ b/src/auth/ExportControl.h @@ -1,5 +1,5 @@ -#ifndef __EXPORTCONTROL_H -#define __EXPORTCONTROL_H +#ifndef CEPH_EXPORTCONTROL_H +#define CEPH_EXPORTCONTROL_H #include <map> #include "config.h" diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h index 9d35e662583..0a442d99eca 100644 --- a/src/auth/KeyRing.h +++ b/src/auth/KeyRing.h @@ -12,8 +12,8 @@ * */ -#ifndef __KEYRING_H -#define __KEYRING_H +#ifndef CEPH_KEYRING_H +#define CEPH_KEYRING_H #include "config.h" diff --git a/src/auth/RotatingKeyRing.h b/src/auth/RotatingKeyRing.h index 13d54a29ba2..21e6fbac98f 100644 --- a/src/auth/RotatingKeyRing.h +++ b/src/auth/RotatingKeyRing.h @@ -12,8 +12,8 @@ * */ -#ifndef __ROTATINGKEYRING_H -#define __ROTATINGKEYRING_H +#ifndef CEPH_ROTATINGKEYRING_H +#define CEPH_ROTATINGKEYRING_H #include "config.h" diff --git a/src/auth/cephx/CephxAuthorizeHandler.h b/src/auth/cephx/CephxAuthorizeHandler.h index 10b942f8678..44df8ba1931 100644 --- a/src/auth/cephx/CephxAuthorizeHandler.h +++ b/src/auth/cephx/CephxAuthorizeHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPHXAUTHORIZEHANDLER_H -#define __CEPHXAUTHORIZEHANDLER_H +#ifndef CEPH_CEPHXAUTHORIZEHANDLER_H +#define CEPH_CEPHXAUTHORIZEHANDLER_H #include "../AuthAuthorizeHandler.h" diff --git a/src/auth/cephx/CephxClientHandler.h b/src/auth/cephx/CephxClientHandler.h index 8234a851e80..bbdeca40ca2 100644 --- a/src/auth/cephx/CephxClientHandler.h +++ b/src/auth/cephx/CephxClientHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPHXCLIENTHANDLER_H -#define __CEPHXCLIENTHANDLER_H +#ifndef CEPH_CEPHXCLIENTHANDLER_H +#define CEPH_CEPHXCLIENTHANDLER_H #include "../AuthClientHandler.h" #include "CephxProtocol.h" diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h index d5d71b1d94d..a78e3effb9b 100644 --- a/src/auth/cephx/CephxKeyServer.h +++ b/src/auth/cephx/CephxKeyServer.h @@ -12,8 +12,8 @@ * */ -#ifndef __KEYSSERVER_H -#define __KEYSSERVER_H +#ifndef CEPH_KEYSSERVER_H +#define CEPH_KEYSSERVER_H #include "config.h" diff --git a/src/auth/cephx/CephxProtocol.h b/src/auth/cephx/CephxProtocol.h index 52cc4402be8..5afc71ee172 100644 --- a/src/auth/cephx/CephxProtocol.h +++ b/src/auth/cephx/CephxProtocol.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPHXPROTOCOL_H -#define __CEPHXPROTOCOL_H +#ifndef CEPH_CEPHXPROTOCOL_H +#define CEPH_CEPHXPROTOCOL_H /* Ceph X protocol diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h index a8a39f09be0..a063b1a13c7 100644 --- a/src/auth/cephx/CephxServiceHandler.h +++ b/src/auth/cephx/CephxServiceHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPHXSERVICEHANDLER_H -#define __CEPHXSERVICEHANDLER_H +#ifndef CEPH_CEPHXSERVICEHANDLER_H +#define CEPH_CEPHXSERVICEHANDLER_H #include "../AuthServiceHandler.h" #include "../Auth.h" diff --git a/src/auth/none/AuthNoneAuthorizeHandler.h b/src/auth/none/AuthNoneAuthorizeHandler.h index f5db034d9ae..a5eaf3b762d 100644 --- a/src/auth/none/AuthNoneAuthorizeHandler.h +++ b/src/auth/none/AuthNoneAuthorizeHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHNONEAUTHORIZEHANDLER_H -#define __AUTHNONEAUTHORIZEHANDLER_H +#ifndef CEPH_AUTHNONEAUTHORIZEHANDLER_H +#define CEPH_AUTHNONEAUTHORIZEHANDLER_H #include "../AuthAuthorizeHandler.h" diff --git a/src/auth/none/AuthNoneClientHandler.h b/src/auth/none/AuthNoneClientHandler.h index c4f4739cb9e..df3e671829f 100644 --- a/src/auth/none/AuthNoneClientHandler.h +++ b/src/auth/none/AuthNoneClientHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHNONECLIENTHANDLER_H -#define __AUTHNONECLIENTHANDLER_H +#ifndef CEPH_AUTHNONECLIENTHANDLER_H +#define CEPH_AUTHNONECLIENTHANDLER_H #include "../AuthClientHandler.h" #include "AuthNoneProtocol.h" diff --git a/src/auth/none/AuthNoneProtocol.h b/src/auth/none/AuthNoneProtocol.h index d5339ccaffa..0d19ebac87d 100644 --- a/src/auth/none/AuthNoneProtocol.h +++ b/src/auth/none/AuthNoneProtocol.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHNONEPROTOCOL_H -#define __AUTHNONEPROTOCOL_H +#ifndef CEPH_AUTHNONEPROTOCOL_H +#define CEPH_AUTHNONEPROTOCOL_H #include "../Auth.h" diff --git a/src/auth/none/AuthNoneServiceHandler.h b/src/auth/none/AuthNoneServiceHandler.h index 271fc365188..69364bdfcec 100644 --- a/src/auth/none/AuthNoneServiceHandler.h +++ b/src/auth/none/AuthNoneServiceHandler.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHNONESERVICEHANDLER_H -#define __AUTHNONESERVICEHANDLER_H +#ifndef CEPH_AUTHNONESERVICEHANDLER_H +#define CEPH_AUTHNONESERVICEHANDLER_H #include "../AuthServiceHandler.h" #include "../Auth.h" diff --git a/src/client/Client.h b/src/client/Client.h index 8f123b0dca2..888d26c6218 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -13,8 +13,8 @@ */ -#ifndef __CLIENT_H -#define __CLIENT_H +#ifndef CEPH_CLIENT_H +#define CEPH_CLIENT_H enum { l_c_first = 20000, diff --git a/src/client/SyntheticClient.h b/src/client/SyntheticClient.h index 79549a261cb..3a1ef64b965 100644 --- a/src/client/SyntheticClient.h +++ b/src/client/SyntheticClient.h @@ -13,8 +13,8 @@ */ -#ifndef __SYNTHETICCLIENT_H -#define __SYNTHETICCLIENT_H +#ifndef CEPH_SYNTHETICCLIENT_H +#define CEPH_SYNTHETICCLIENT_H #include <pthread.h> diff --git a/src/client/Trace.h b/src/client/Trace.h index 39aba621ee3..6665f21b4f8 100644 --- a/src/client/Trace.h +++ b/src/client/Trace.h @@ -13,8 +13,8 @@ */ -#ifndef __CLIENT_TRACE_H -#define __CLIENT_TRACE_H +#ifndef CEPH_CLIENT_TRACE_H +#define CEPH_CLIENT_TRACE_H #include <stdlib.h> diff --git a/src/client/hypertable/CephBroker.h b/src/client/hypertable/CephBroker.h index d860dfed2e7..7de3f438010 100644 --- a/src/client/hypertable/CephBroker.h +++ b/src/client/hypertable/CephBroker.h @@ -12,8 +12,8 @@ * */ -#ifndef HYPERTABLE_CEPHBROKER_H -#define HYPERTABLE_CEPHBROKER_H +#ifndef CEPH_HYPERTABLE_BROKER_H +#define CEPH_HYPERTABLE_BROKER_H extern "C" { #include <unistd.h> diff --git a/src/client/ioctl.h b/src/client/ioctl.h index 15a8a87613d..04ee8dab689 100644 --- a/src/client/ioctl.h +++ b/src/client/ioctl.h @@ -1,5 +1,5 @@ -#ifndef FS_CEPH_IOCTL_H -#define FS_CEPH_IOCTL_H +#ifndef CEPH_FS_IOCTL_H +#define CEPH_FS_IOCTL_H #include <linux/ioctl.h> #include <linux/types.h> diff --git a/src/client/libceph.h b/src/client/libceph.h index 1a03d69d815..ccc4b27b876 100644 --- a/src/client/libceph.h +++ b/src/client/libceph.h @@ -1,5 +1,5 @@ -#ifndef __LIBCEPH_H -#define __LIBCEPH_H +#ifndef CEPH_LIB_H +#define CEPH_LIB_H #include <netinet/in.h> #include <sys/statvfs.h> #include <utime.h> diff --git a/src/common/BackTrace.h b/src/common/BackTrace.h index 71a0cccc86b..9e0c020807a 100644 --- a/src/common/BackTrace.h +++ b/src/common/BackTrace.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_BACKTRACE -#define _CEPH_BACKTRACE +#ifndef CEPH_BACKTRACE_H +#define CEPH_BACKTRACE_H #include <execinfo.h> #include <stdlib.h> diff --git a/src/common/ClassHandler.h b/src/common/ClassHandler.h index e9c1e2005ed..871144ab557 100644 --- a/src/common/ClassHandler.h +++ b/src/common/ClassHandler.h @@ -1,5 +1,5 @@ -#ifndef __CLASSHANDLER_H -#define __CLASSHANDLER_H +#ifndef CEPH_CLASSHANDLER_H +#define CEPH_CLASSHANDLER_H #include "include/types.h" #include "include/ClassLibrary.h" diff --git a/src/common/ClassVersion.h b/src/common/ClassVersion.h index 85681c0a4d8..48813d2e036 100644 --- a/src/common/ClassVersion.h +++ b/src/common/ClassVersion.h @@ -1,5 +1,5 @@ -#ifndef __CLASSVERSION_H -#define __CLASSVERSION_H +#ifndef CEPH_CLASSVERSION_H +#define CEPH_CLASSVERSION_H #include "include/types.h" diff --git a/src/common/Clock.h b/src/common/Clock.h index 84f1c27a003..646d4febd10 100644 --- a/src/common/Clock.h +++ b/src/common/Clock.h @@ -14,8 +14,8 @@ -#ifndef __CLOCK_H -#define __CLOCK_H +#ifndef CEPH_CLOCK_H +#define CEPH_CLOCK_H #include <iostream> #include <iomanip> diff --git a/src/common/Cond.h b/src/common/Cond.h index 3b0c396aedc..f20d3407e76 100644 --- a/src/common/Cond.h +++ b/src/common/Cond.h @@ -13,8 +13,8 @@ */ -#ifndef __COND_H -#define __COND_H +#ifndef CEPH_COND_H +#define CEPH_COND_H #include <time.h> diff --git a/src/common/ConfUtils.h b/src/common/ConfUtils.h index f3a17aafd41..7ec736701b4 100644 --- a/src/common/ConfUtils.h +++ b/src/common/ConfUtils.h @@ -1,5 +1,5 @@ -#ifndef __CONFUTILS_H -#define __CONFUTILS_H +#ifndef CEPH_CONFUTILS_H +#define CEPH_CONFUTILS_H #include <string.h> diff --git a/src/common/DecayCounter.h b/src/common/DecayCounter.h index 3c1722db72a..763dc0f33db 100644 --- a/src/common/DecayCounter.h +++ b/src/common/DecayCounter.h @@ -12,8 +12,8 @@ * */ -#ifndef __DECAYCOUNTER_H -#define __DECAYCOUNTER_H +#ifndef CEPH_DECAYCOUNTER_H +#define CEPH_DECAYCOUNTER_H #include <math.h> #include "Clock.h" diff --git a/src/common/Finisher.h b/src/common/Finisher.h index 901e668edbb..1c4a377cbb2 100644 --- a/src/common/Finisher.h +++ b/src/common/Finisher.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_FINISHER_H -#define __CEPH_FINISHER_H +#ifndef CEPH_FINISHER_H +#define CEPH_FINISHER_H #include "common/Mutex.h" #include "common/Cond.h" diff --git a/src/common/LogClient.h b/src/common/LogClient.h index 24d8ce20e7e..a6584739f64 100644 --- a/src/common/LogClient.h +++ b/src/common/LogClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __LOGCLIENT_H -#define __LOGCLIENT_H +#ifndef CEPH_LOGCLIENT_H +#define CEPH_LOGCLIENT_H #include "msg/Dispatcher.h" diff --git a/src/common/LogType.h b/src/common/LogType.h index 0fc038c378c..961d6ac54a2 100644 --- a/src/common/LogType.h +++ b/src/common/LogType.h @@ -13,8 +13,8 @@ */ -#ifndef __LOGTYPE_H -#define __LOGTYPE_H +#ifndef CEPH_LOGTYPE_H +#define CEPH_LOGTYPE_H #include "include/types.h" diff --git a/src/common/Logger.h b/src/common/Logger.h index b04bce2a1d5..60a73ece302 100644 --- a/src/common/Logger.h +++ b/src/common/Logger.h @@ -13,8 +13,8 @@ */ -#ifndef __LOGGER_H -#define __LOGGER_H +#ifndef CEPH_LOGGER_H +#define CEPH_LOGGER_H #include "include/types.h" #include "Clock.h" diff --git a/src/common/MemoryModel.h b/src/common/MemoryModel.h index 509b7d9b364..53c29604c76 100644 --- a/src/common/MemoryModel.h +++ b/src/common/MemoryModel.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_MEMORYMODEL_H -#define __CEPH_MEMORYMODEL_H +#ifndef CEPH_MEMORYMODEL_H +#define CEPH_MEMORYMODEL_H class MemoryModel { public: diff --git a/src/common/Mutex.h b/src/common/Mutex.h index 7132e2bafbe..8a163f5bfd2 100644 --- a/src/common/Mutex.h +++ b/src/common/Mutex.h @@ -12,8 +12,8 @@ * */ -#ifndef __MUTEX_H -#define __MUTEX_H +#ifndef CEPH_MUTEX_H +#define CEPH_MUTEX_H #include <pthread.h> #include "include/assert.h" diff --git a/src/common/RWLock.h b/src/common/RWLock.h index 7db72f07e3b..adbd5f00193 100644 --- a/src/common/RWLock.h +++ b/src/common/RWLock.h @@ -14,8 +14,8 @@ -#ifndef _RWLock_Posix_ -#define _RWLock_Posix_ +#ifndef CEPH_RWLock_Posix__H +#define CEPH_RWLock_Posix__H #include <pthread.h> #include "lockdep.h" diff --git a/src/common/Semaphore.h b/src/common/Semaphore.h index 62861a02e6c..3a5ecdc9585 100644 --- a/src/common/Semaphore.h +++ b/src/common/Semaphore.h @@ -13,8 +13,8 @@ */ -#ifndef _Sem_Posix_ -#define _Sem_Posix_ +#ifndef CEPH_Sem_Posix__H +#define CEPH_Sem_Posix__H class Semaphore { diff --git a/src/common/Thread.h b/src/common/Thread.h index c65804462a3..469249280c4 100644 --- a/src/common/Thread.h +++ b/src/common/Thread.h @@ -13,8 +13,8 @@ */ -#ifndef __THREAD_H -#define __THREAD_H +#ifndef CEPH_THREAD_H +#define CEPH_THREAD_H #include <pthread.h> #include <signal.h> diff --git a/src/common/Throttle.h b/src/common/Throttle.h index b1c82b55c87..e940937b9ea 100644 --- a/src/common/Throttle.h +++ b/src/common/Throttle.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_THROTTLE_H -#define _CEPH_THROTTLE_H +#ifndef CEPH_THROTTLE_H +#define CEPH_THROTTLE_H #include "Mutex.h" #include "Cond.h" diff --git a/src/common/Timer.h b/src/common/Timer.h index e3611321768..63d19021d9b 100644 --- a/src/common/Timer.h +++ b/src/common/Timer.h @@ -13,8 +13,8 @@ */ -#ifndef __TIMER_H -#define __TIMER_H +#ifndef CEPH_TIMER_H +#define CEPH_TIMER_H #include "include/types.h" #include "include/Context.h" diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h index 9f0ab47a042..1e0aaaf8265 100644 --- a/src/common/WorkQueue.h +++ b/src/common/WorkQueue.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_WORKQUEUE -#define __CEPH_WORKQUEUE +#ifndef CEPH_WORKQUEUE_H +#define CEPH_WORKQUEUE_H #include "Mutex.h" #include "Cond.h" diff --git a/src/common/arch.h b/src/common/arch.h index 3b3a078500e..09dbe7c90c6 100644 --- a/src/common/arch.h +++ b/src/common/arch.h @@ -1,5 +1,5 @@ -#ifndef __ARCH_H - +#ifndef CEPH_ARCH_H +#define CEPH_ARCH_H static const char *get_arch() { diff --git a/src/common/armor.h b/src/common/armor.h index baba1223945..aa9407dad5e 100644 --- a/src/common/armor.h +++ b/src/common/armor.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_ARMOR -#define __CEPH_ARMOR +#ifndef CEPH_ARMOR_H +#define CEPH_ARMOR_H extern "C" { int ceph_armor(char *dst, const char *src, const char *end); diff --git a/src/common/base64.h b/src/common/base64.h index a5c96705ef3..db9bd76c636 100644 --- a/src/common/base64.h +++ b/src/common/base64.h @@ -1,5 +1,5 @@ -#ifndef __BASE64_H -#define __BASE64_H +#ifndef CEPH_BASE64_H +#define CEPH_BASE64_H extern "C" { int encode_base64(const char *in, int in_len, char *out, int out_len); diff --git a/src/common/cas.h b/src/common/cas.h index 073c015ba22..cc541770489 100644 --- a/src/common/cas.h +++ b/src/common/cas.h @@ -1,7 +1,7 @@ -#ifndef __CEPH_CAS_H -#define __CEPH_CAS_H +#ifndef CEPH_CAS_H +#define CEPH_CAS_H #include "include/object.h" diff --git a/src/common/common_init.h b/src/common/common_init.h index 28a035d2d3e..ace36c1971d 100644 --- a/src/common/common_init.h +++ b/src/common/common_init.h @@ -1,5 +1,5 @@ -#ifndef __COMMON_INIT_H -#define __COMMON_INIT_H +#ifndef CEPH_COMMON_INIT_H +#define CEPH_COMMON_INIT_H #include <vector> diff --git a/src/common/debug.h b/src/common/debug.h index 792b379a1fe..8bb31251a4b 100644 --- a/src/common/debug.h +++ b/src/common/debug.h @@ -1,8 +1,8 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __CEPH_DEBUG_H -#define __CEPH_DEBUG_H +#ifndef CEPH_DEBUG_H +#define CEPH_DEBUG_H #include "include/assert.h" #include "Mutex.h" diff --git a/src/common/dyn_snprintf.h b/src/common/dyn_snprintf.h index 743b1a9f386..09eb1a269a1 100644 --- a/src/common/dyn_snprintf.h +++ b/src/common/dyn_snprintf.h @@ -1,5 +1,5 @@ -#ifndef __DYN_SNPRINTF_H -#define __DYN_SNPRINTF_H +#ifndef CEPH_DYN_SNPRINTF_H +#define CEPH_DYN_SNPRINTF_H #ifdef __cplusplus extern "C" { diff --git a/src/common/lockdep.h b/src/common/lockdep.h index 78784bcbbe0..d78e50a8629 100644 --- a/src/common/lockdep.h +++ b/src/common/lockdep.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_LOCKDEP_H -#define _CEPH_LOCKDEP_H +#ifndef CEPH_LOCKDEP_H +#define CEPH_LOCKDEP_H extern int g_lockdep; diff --git a/src/common/tls.h b/src/common/tls.h index 429f4f658ee..3293932ab82 100644 --- a/src/common/tls.h +++ b/src/common/tls.h @@ -1,5 +1,5 @@ -#ifndef __TLS_H -#define __TLS_H +#ifndef CEPH_TLS_H +#define CEPH_TLS_H struct TlsData { int disable_assert; diff --git a/src/config.h b/src/config.h index b21774e0207..2a125553860 100644 --- a/src/config.h +++ b/src/config.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_CONFIG_H -#define __CEPH_CONFIG_H +#ifndef CEPH_CONFIG_H +#define CEPH_CONFIG_H extern struct ceph_file_layout g_default_file_layout; diff --git a/src/crush.old/BinaryTree.h b/src/crush.old/BinaryTree.h index 7573fc02ed6..75bbd9e6ebd 100644 --- a/src/crush.old/BinaryTree.h +++ b/src/crush.old/BinaryTree.h @@ -12,8 +12,8 @@ * */ -#ifndef __crush_BINARYTREE_H -#define __crush_BINARYTREE_H +#ifndef CEPH_crush_BINARYTREE_H +#define CEPH_crush_BINARYTREE_H #include <cassert> #include <iostream> diff --git a/src/crush.old/Bucket.h b/src/crush.old/Bucket.h index 81a2576697b..bff88068ba9 100644 --- a/src/crush.old/Bucket.h +++ b/src/crush.old/Bucket.h @@ -12,8 +12,8 @@ * */ -#ifndef __crush_BUCKET_H -#define __crush_BUCKET_H +#ifndef CEPH_crush_BUCKET_H +#define CEPH_crush_BUCKET_H #include "BinaryTree.h" #include "Hash.h" diff --git a/src/crush.old/crush.h b/src/crush.old/crush.h index 376e7d9b3fc..6f7ef850f67 100644 --- a/src/crush.old/crush.h +++ b/src/crush.old/crush.h @@ -12,8 +12,8 @@ * */ -#ifndef __crush_CRUSH_H -#define __crush_CRUSH_H +#ifndef CEPH_crush_CRUSH_H +#define CEPH_crush_CRUSH_H #include <iostream> #include <list> diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index 161529ec272..bb73fed3737 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -1,8 +1,8 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __CRUSH_WRAPPER_H -#define __CRUSH_WRAPPER_H +#ifndef CEPH_CRUSH_WRAPPER_H +#define CEPH_CRUSH_WRAPPER_H #define BUG_ON(x) assert(!(x)) #include "include/types.h" diff --git a/src/crush/builder.h b/src/crush/builder.h index a83d858c76c..02ed57f0533 100644 --- a/src/crush/builder.h +++ b/src/crush/builder.h @@ -1,5 +1,5 @@ -#ifndef _CRUSH_BUILDER_H -#define _CRUSH_BUILDER_H +#ifndef CEPH_CRUSH_BUILDER_H +#define CEPH_CRUSH_BUILDER_H #include "crush.h" diff --git a/src/crush/crush.h b/src/crush/crush.h index dcd7e752370..97e435b191f 100644 --- a/src/crush/crush.h +++ b/src/crush/crush.h @@ -1,5 +1,5 @@ -#ifndef _CRUSH_CRUSH_H -#define _CRUSH_CRUSH_H +#ifndef CEPH_CRUSH_CRUSH_H +#define CEPH_CRUSH_CRUSH_H #include <linux/types.h> diff --git a/src/crush/grammar.h b/src/crush/grammar.h index 36509e1f445..8c7a4667953 100644 --- a/src/crush/grammar.h +++ b/src/crush/grammar.h @@ -12,8 +12,8 @@ * */ -#ifndef __CRUSH_GRAMMAR_H -#define __CRUSH_GRAMMAR_H +#ifndef CEPH_CRUSH_GRAMMAR_H +#define CEPH_CRUSH_GRAMMAR_H //#define BOOST_SPIRIT_DEBUG diff --git a/src/crush/hash.h b/src/crush/hash.h index ff48e110e4b..91e884230d5 100644 --- a/src/crush/hash.h +++ b/src/crush/hash.h @@ -1,5 +1,5 @@ -#ifndef _CRUSH_HASH_H -#define _CRUSH_HASH_H +#ifndef CEPH_CRUSH_HASH_H +#define CEPH_CRUSH_HASH_H #define CRUSH_HASH_RJENKINS1 0 diff --git a/src/crush/mapper.h b/src/crush/mapper.h index 98e90046fd9..c46b99c18bb 100644 --- a/src/crush/mapper.h +++ b/src/crush/mapper.h @@ -1,5 +1,5 @@ -#ifndef _CRUSH_MAPPER_H -#define _CRUSH_MAPPER_H +#ifndef CEPH_CRUSH_MAPPER_H +#define CEPH_CRUSH_MAPPER_H /* * CRUSH functions for find rules and then mapping an input to an diff --git a/src/crush/types.h b/src/crush/types.h index 319728e526d..61f50c2130f 100644 --- a/src/crush/types.h +++ b/src/crush/types.h @@ -1,5 +1,5 @@ -#ifndef _CRUSH_TYPES_H -#define _CRUSH_TYPES_H +#ifndef CEPH_CRUSH_TYPES_H +#define CEPH_CRUSH_TYPES_H #ifdef KERNEL # define free(x) kfree(x) diff --git a/src/ebofs/Allocator.h b/src/ebofs/Allocator.h index 09cd502d2f0..ba194cd4f7d 100644 --- a/src/ebofs/Allocator.h +++ b/src/ebofs/Allocator.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_ALLOCATOR_H -#define __EBOFS_ALLOCATOR_H +#ifndef CEPH_EBOFS_ALLOCATOR_H +#define CEPH_EBOFS_ALLOCATOR_H #include "types.h" diff --git a/src/ebofs/BlockDevice.h b/src/ebofs/BlockDevice.h index d4019ee1a3e..d1cbcd2bdd3 100644 --- a/src/ebofs/BlockDevice.h +++ b/src/ebofs/BlockDevice.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_BLOCKDEVICE_H -#define __EBOFS_BLOCKDEVICE_H +#ifndef CEPH_EBOFS_BLOCKDEVICE_H +#define CEPH_EBOFS_BLOCKDEVICE_H using namespace std; #include "include/buffer.h" diff --git a/src/ebofs/BufferCache.h b/src/ebofs/BufferCache.h index 86173c74e97..0c2900d7f9d 100644 --- a/src/ebofs/BufferCache.h +++ b/src/ebofs/BufferCache.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_BUFFERCACHE_H -#define __EBOFS_BUFFERCACHE_H +#ifndef CEPH_EBOFS_BUFFERCACHE_H +#define CEPH_EBOFS_BUFFERCACHE_H #include "include/lru.h" #include "include/Context.h" diff --git a/src/ebofs/Cnode.h b/src/ebofs/Cnode.h index 810124532cf..5d05ebe163e 100644 --- a/src/ebofs/Cnode.h +++ b/src/ebofs/Cnode.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_CNODE_H -#define __EBOFS_CNODE_H +#ifndef CEPH_EBOFS_CNODE_H +#define CEPH_EBOFS_CNODE_H #include "Onode.h" diff --git a/src/ebofs/Onode.h b/src/ebofs/Onode.h index 24c961040f3..a1f3bc43e2e 100644 --- a/src/ebofs/Onode.h +++ b/src/ebofs/Onode.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_ONODE_H -#define __EBOFS_ONODE_H +#ifndef CEPH_EBOFS_ONODE_H +#define CEPH_EBOFS_ONODE_H #include "include/lru.h" diff --git a/src/ebofs/Table.h b/src/ebofs/Table.h index 949843d523b..c960fa89542 100644 --- a/src/ebofs/Table.h +++ b/src/ebofs/Table.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_TABLE_H -#define __EBOFS_TABLE_H +#ifndef CEPH_EBOFS_TABLE_H +#define CEPH_EBOFS_TABLE_H #include "types.h" #include "nodes.h" diff --git a/src/ebofs/nodes.h b/src/ebofs/nodes.h index 9e6aabe33e2..4f357df8c3f 100644 --- a/src/ebofs/nodes.h +++ b/src/ebofs/nodes.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_NODES_H -#define __EBOFS_NODES_H +#ifndef CEPH_EBOFS_NODES_H +#define CEPH_EBOFS_NODES_H /** nodes, node regions **/ diff --git a/src/ebofs/types.h b/src/ebofs/types.h index c0fcabbd8c2..f9a97c48367 100644 --- a/src/ebofs/types.h +++ b/src/ebofs/types.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_TYPES_H -#define __EBOFS_TYPES_H +#ifndef CEPH_EBOFS_TYPES_H +#define CEPH_EBOFS_TYPES_H #include "include/buffer.h" #include "include/Context.h" diff --git a/src/include/ClassLibrary.h b/src/include/ClassLibrary.h index b6a1bbe794f..63970666257 100644 --- a/src/include/ClassLibrary.h +++ b/src/include/ClassLibrary.h @@ -12,8 +12,8 @@ * */ -#ifndef __CLASSLIBRARY_H -#define __CLASSLIBRARY_H +#ifndef CEPH_CLASSLIBRARY_H +#define CEPH_CLASSLIBRARY_H #include "include/types.h" #include "include/encoding.h" diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h index 3d01b95802a..050853cdb4f 100644 --- a/src/include/CompatSet.h +++ b/src/include/CompatSet.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_COMPATSET_H -#define __CEPH_COMPATSET_H +#ifndef CEPH_COMPATSET_H +#define CEPH_COMPATSET_H #include "include/buffer.h" #include <vector> diff --git a/src/include/Completion.h b/src/include/Completion.h index 4cf1e28d282..e90f57498b1 100644 --- a/src/include/Completion.h +++ b/src/include/Completion.h @@ -13,8 +13,8 @@ */ -#ifndef __COMPLETION_H -#define __COMPLETION_H +#ifndef CEPH_COMPLETION_H +#define CEPH_COMPLETION_H struct Completion : public Context { diff --git a/src/include/Context.h b/src/include/Context.h index ca01594e169..1591602cc2b 100644 --- a/src/include/Context.h +++ b/src/include/Context.h @@ -13,8 +13,8 @@ */ -#ifndef __CONTEXT_H -#define __CONTEXT_H +#ifndef CEPH_CONTEXT_H +#define CEPH_CONTEXT_H #include "config.h" diff --git a/src/include/Distribution.h b/src/include/Distribution.h index 4f78009276f..a86b21b6067 100644 --- a/src/include/Distribution.h +++ b/src/include/Distribution.h @@ -13,8 +13,8 @@ */ -#ifndef __DISTRIBUTION_H -#define __DISTRIBUTION_H +#ifndef CEPH_DISTRIBUTION_H +#define CEPH_DISTRIBUTION_H #include <vector> using namespace std; diff --git a/src/include/LogEntry.h b/src/include/LogEntry.h index 26a61930dc8..1cc02bcb274 100644 --- a/src/include/LogEntry.h +++ b/src/include/LogEntry.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_LOGENTRY_H -#define __CEPH_LOGENTRY_H +#ifndef CEPH_LOGENTRY_H +#define CEPH_LOGENTRY_H #include "include/types.h" #include "include/encoding.h" diff --git a/src/include/Spinlock.h b/src/include/Spinlock.h index 9ebff164a1a..690c87c157f 100644 --- a/src/include/Spinlock.h +++ b/src/include/Spinlock.h @@ -12,8 +12,8 @@ * */ -#ifndef __SPINLOCK_H -#define __SPINLOCK_H +#ifndef CEPH_SPINLOCK_H +#define CEPH_SPINLOCK_H #include <pthread.h> #include "assert.h" diff --git a/src/include/assert.h b/src/include/assert.h index 32459109c7a..060352aa26a 100644 --- a/src/include/assert.h +++ b/src/include/assert.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_ASSERT_H -#define __CEPH_ASSERT_H +#ifndef CEPH_ASSERT_H +#define CEPH_ASSERT_H #include <features.h> diff --git a/src/include/bitmapper.h b/src/include/bitmapper.h index 4bed9e0a81d..5a65cc20fd7 100644 --- a/src/include/bitmapper.h +++ b/src/include/bitmapper.h @@ -12,8 +12,8 @@ * */ -#ifndef __BITMAPPER_H -#define __BITMAPPER_H +#ifndef CEPH_BITMAPPER_H +#define CEPH_BITMAPPER_H class bitmapper { char *_data; diff --git a/src/include/blobhash.h b/src/include/blobhash.h index a3703e46d67..3544649e019 100644 --- a/src/include/blobhash.h +++ b/src/include/blobhash.h @@ -11,8 +11,8 @@ * */ -#ifndef __BLOBHASH_H -#define __BLOBHASH_H +#ifndef CEPH_BLOBHASH_H +#define CEPH_BLOBHASH_H #include "hash.h" diff --git a/src/include/buffer.h b/src/include/buffer.h index 01316fa1522..4a147521bee 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -12,8 +12,8 @@ * */ -#ifndef __BUFFER_H -#define __BUFFER_H +#ifndef CEPH_BUFFER_H +#define CEPH_BUFFER_H #include <linux/types.h> diff --git a/src/include/byteorder.h b/src/include/byteorder.h index 0d20145baa3..f49cb6658be 100644 --- a/src/include/byteorder.h +++ b/src/include/byteorder.h @@ -4,8 +4,8 @@ * LGPL 2 */ -#ifndef _CEPH_BYTEORDER_H -#define _CEPH_BYTEORDER_H +#ifndef CEPH_BYTEORDER_H +#define CEPH_BYTEORDER_H #include <endian.h> diff --git a/src/include/ceph_frag.h b/src/include/ceph_frag.h index 793f50cb7c2..0f1ab9be740 100644 --- a/src/include/ceph_frag.h +++ b/src/include/ceph_frag.h @@ -1,5 +1,5 @@ -#ifndef _FS_CEPH_FRAG_H -#define _FS_CEPH_FRAG_H +#ifndef CEPH_FRAG_H +#define CEPH_FRAG_H /* * "Frags" are a way to describe a subset of a 32-bit number space, diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index d11c6b0b6d2..3d06f1f2b1c 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -9,8 +9,8 @@ * LGPL2 */ -#ifndef _FS_CEPH_CEPH_FS_H -#define _FS_CEPH_CEPH_FS_H +#ifndef CEPH_FS_H +#define CEPH_FS_H #include "msgr.h" #include "rados.h" diff --git a/src/include/ceph_hash.h b/src/include/ceph_hash.h index 5ac470c433c..ca28a5a6513 100644 --- a/src/include/ceph_hash.h +++ b/src/include/ceph_hash.h @@ -1,5 +1,5 @@ -#ifndef _FS_CEPH_HASH_H -#define _FS_CEPH_HASH_H +#ifndef CEPH_HASH_H +#define CEPH_HASH_H #define CEPH_STR_HASH_LINUX 0x1 /* linux dcache hash */ #define CEPH_STR_HASH_RJENKINS 0x2 /* robert jenkins' */ diff --git a/src/include/color.h b/src/include/color.h index d267eeff6c7..00c765e93ca 100644 --- a/src/include/color.h +++ b/src/include/color.h @@ -1,5 +1,5 @@ -#ifndef __COLOR_H -#define __COLOR_H +#ifndef CEPH_COLOR_H +#define CEPH_COLOR_H #define TEXT_NORMAL "\033[0m" #define TEXT_HAZARD "\033[5;31m" diff --git a/src/include/crc32c.h b/src/include/crc32c.h index 185ab7f23ef..e3cf8ff2704 100644 --- a/src/include/crc32c.h +++ b/src/include/crc32c.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_CRC32C_H -#define __CEPH_CRC32C_H +#ifndef CEPH_CRC32C_H +#define CEPH_CRC32C_H #ifdef __cplusplus extern "C" { diff --git a/src/include/cstring.h b/src/include/cstring.h index 9f00cc38309..d23bc885a09 100644 --- a/src/include/cstring.h +++ b/src/include/cstring.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_CSTRING_H -#define _CEPH_CSTRING_H +#ifndef CEPH_CSTRING_H +#define CEPH_CSTRING_H /* * cstring - a simple string class diff --git a/src/include/dlist.h b/src/include/dlist.h index 58379ece74e..5a4811db72e 100644 --- a/src/include/dlist.h +++ b/src/include/dlist.h @@ -12,8 +12,8 @@ * */ -#ifndef __DLIST_H -#define __DLIST_H +#ifndef CEPH_DLIST_H +#define CEPH_DLIST_H template<typename T> class dlist { diff --git a/src/include/elist.h b/src/include/elist.h index 762f68d8a3b..112e3706e72 100644 --- a/src/include/elist.h +++ b/src/include/elist.h @@ -12,8 +12,8 @@ * */ -#ifndef __ELIST_H -#define __ELIST_H +#ifndef CEPH_ELIST_H +#define CEPH_ELIST_H /* * elist: embedded list. diff --git a/src/include/encoding.h b/src/include/encoding.h index ada12101c98..0e3c55f7d29 100644 --- a/src/include/encoding.h +++ b/src/include/encoding.h @@ -12,8 +12,8 @@ * */ -#ifndef __ENCODING_H -#define __ENCODING_H +#ifndef CEPH_ENCODING_H +#define CEPH_ENCODING_H #include "inttypes.h" #include "byteorder.h" diff --git a/src/include/err.h b/src/include/err.h index 3690323ee22..ba4b32aec38 100644 --- a/src/include/err.h +++ b/src/include/err.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_ERR_H -#define __CEPH_ERR_H +#ifndef CEPH_ERR_H +#define CEPH_ERR_H /* * adapted from linux 2.6.24 include/linux/err.h diff --git a/src/include/filepath.h b/src/include/filepath.h index 4b989e4ec0d..bd83b054823 100644 --- a/src/include/filepath.h +++ b/src/include/filepath.h @@ -13,8 +13,8 @@ */ -#ifndef __FILEPATH_H -#define __FILEPATH_H +#ifndef CEPH_FILEPATH_H +#define CEPH_FILEPATH_H /* diff --git a/src/include/frag.h b/src/include/frag.h index bfae38eda86..fa8c2bcfd4a 100644 --- a/src/include/frag.h +++ b/src/include/frag.h @@ -12,8 +12,8 @@ * */ -#ifndef __FRAG_H -#define __FRAG_H +#ifndef CEPH_FRAG_H +#define CEPH_FRAG_H #include <stdint.h> #include <map> diff --git a/src/include/hash.h b/src/include/hash.h index bb1499cada4..38385e0eac5 100644 --- a/src/include/hash.h +++ b/src/include/hash.h @@ -1,5 +1,5 @@ -#ifndef __CEPHHASH_H -#define __CEPHHASH_H +#ifndef CEPH_HASH_H +#define CEPH_HASH_H #include "../acconfig.h" diff --git a/src/include/intarith.h b/src/include/intarith.h index c3ac0f7c626..640129cea46 100644 --- a/src/include/intarith.h +++ b/src/include/intarith.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_INTARITH_H -#define __CEPH_INTARITH_H +#ifndef CEPH_INTARITH_H +#define CEPH_INTARITH_H #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a):(b)) diff --git a/src/include/interval_set.h b/src/include/interval_set.h index 32c6a270109..12f4c57a5dd 100644 --- a/src/include/interval_set.h +++ b/src/include/interval_set.h @@ -13,8 +13,8 @@ */ -#ifndef __INTERVAL_SET_H -#define __INTERVAL_SET_H +#ifndef CEPH_INTERVAL_SET_H +#define CEPH_INTERVAL_SET_H #include <map> #include <ostream> diff --git a/src/include/librados.h b/src/include/librados.h index 457bc602cb8..800878f222d 100644 --- a/src/include/librados.h +++ b/src/include/librados.h @@ -1,5 +1,5 @@ -#ifndef __LIBRADOS_H -#define __LIBRADOS_H +#ifndef CEPH_LIBRADOS_H +#define CEPH_LIBRADOS_H #ifdef __cplusplus extern "C" { diff --git a/src/include/lru.h b/src/include/lru.h index c52aac2d0b1..73eaa742eb8 100644 --- a/src/include/lru.h +++ b/src/include/lru.h @@ -14,8 +14,8 @@ -#ifndef __LRU_H -#define __LRU_H +#ifndef CEPH_LRU_H +#define CEPH_LRU_H #include <stdint.h> diff --git a/src/include/msgr.h b/src/include/msgr.h index 892a0298dfd..680d3d648ca 100644 --- a/src/include/msgr.h +++ b/src/include/msgr.h @@ -1,5 +1,5 @@ -#ifndef __MSGR_H -#define __MSGR_H +#ifndef CEPH_MSGR_H +#define CEPH_MSGR_H /* * Data types for message passing layer used by Ceph. diff --git a/src/include/nstring.h b/src/include/nstring.h index 0a39959a703..28d95ff3fcb 100644 --- a/src/include/nstring.h +++ b/src/include/nstring.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_NSTRING -#define _CEPH_NSTRING +#ifndef CEPH_NSTRING_D44FAD468A084A2D994D171C04DE05BD +#define CEPH_NSTRING_D44FAD468A084A2D994D171C04DE05BD #if 0 # include "tstring.h" diff --git a/src/include/object.h b/src/include/object.h index 027202d2df6..1039e2f783d 100644 --- a/src/include/object.h +++ b/src/include/object.h @@ -12,8 +12,8 @@ * */ -#ifndef __OBJECT_H -#define __OBJECT_H +#ifndef CEPH_OBJECT_H +#define CEPH_OBJECT_H #include <stdint.h> #include <stdio.h> diff --git a/src/include/page.h b/src/include/page.h index 0c620029c9d..ce4f985676f 100644 --- a/src/include/page.h +++ b/src/include/page.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_PAGE_H -#define __CEPH_PAGE_H +#ifndef CEPH_PAGE_H +#define CEPH_PAGE_H namespace ceph { // these are in common/page.cc diff --git a/src/include/rados.h b/src/include/rados.h index ccc27fc1096..6eb4de36c5d 100644 --- a/src/include/rados.h +++ b/src/include/rados.h @@ -1,5 +1,5 @@ -#ifndef __RADOS_H -#define __RADOS_H +#ifndef CEPH_RADOS_H +#define CEPH_RADOS_H /* * Data types for the Ceph distributed object storage layer RADOS diff --git a/src/include/rangeset.h b/src/include/rangeset.h index 2bd5dc35a2c..9eb0b709b0a 100644 --- a/src/include/rangeset.h +++ b/src/include/rangeset.h @@ -13,8 +13,8 @@ */ -#ifndef __RANGESET_H -#define __RANGESET_H +#ifndef CEPH_RANGESET_H +#define CEPH_RANGESET_H /* * diff --git a/src/include/statlite.h b/src/include/statlite.h index a9c0433e4a4..2ab3a940687 100644 --- a/src/include/statlite.h +++ b/src/include/statlite.h @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef _STATLITE_H -#define _STATLITE_H +#ifndef CEPH_STATLITE_H +#define CEPH_STATLITE_H extern "C" { diff --git a/src/include/str_list.h b/src/include/str_list.h index 9246b0be94b..f96485ebafc 100644 --- a/src/include/str_list.h +++ b/src/include/str_list.h @@ -1,5 +1,5 @@ -#ifndef __STRLIST_H -#define __STRLIST_H +#ifndef CEPH_STRLIST_H +#define CEPH_STRLIST_H #include <string> #include <list> diff --git a/src/include/triple.h b/src/include/triple.h index a6dc8ac5de6..c2917127feb 100644 --- a/src/include/triple.h +++ b/src/include/triple.h @@ -12,8 +12,8 @@ * */ -#ifndef __TRIPLE_H -#define __TRIPLE_H +#ifndef CEPH_TRIPLE_H +#define CEPH_TRIPLE_H template<class A, class B, class C> class triple { diff --git a/src/include/tstring.h b/src/include/tstring.h index 5a9f661176f..9d3e16b234a 100644 --- a/src/include/tstring.h +++ b/src/include/tstring.h @@ -1,5 +1,5 @@ -#ifndef _CEPH_TSTRING -#define _CEPH_TSTRING +#ifndef CEPH_TSTRING_6183F100D51A4EDABFB908CB07D30601 +#define CEPH_TSTRING_6183F100D51A4EDABFB908CB07D30601 #include "common/Mutex.h" diff --git a/src/include/uofs.h b/src/include/uofs.h index a4673aaa616..41346a04d88 100644 --- a/src/include/uofs.h +++ b/src/include/uofs.h @@ -19,8 +19,8 @@ * user-level object-based file system */ - #ifndef _UOFS_H_ - #define _UOFS_H_ + #ifndef CEPH_UOFS_H + #define CEPH_UOFS_H #include <sys/types.h> #include <unistd.h> diff --git a/src/include/xlist.h b/src/include/xlist.h index 5adf5b71fab..f6139a16ae5 100644 --- a/src/include/xlist.h +++ b/src/include/xlist.h @@ -12,8 +12,8 @@ * */ -#ifndef __XLIST_H -#define __XLIST_H +#ifndef CEPH_XLIST_H +#define CEPH_XLIST_H template<typename T> class xlist { diff --git a/src/mds/Anchor.h b/src/mds/Anchor.h index adbe9612915..813701d1e44 100644 --- a/src/mds/Anchor.h +++ b/src/mds/Anchor.h @@ -12,8 +12,8 @@ * */ -#ifndef __ANCHOR_H -#define __ANCHOR_H +#ifndef CEPH_ANCHOR_H +#define CEPH_ANCHOR_H #include <string> using std::string; diff --git a/src/mds/AnchorClient.h b/src/mds/AnchorClient.h index 23c6a3f3aff..049cbcb0803 100644 --- a/src/mds/AnchorClient.h +++ b/src/mds/AnchorClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __ANCHORCLIENT_H -#define __ANCHORCLIENT_H +#ifndef CEPH_ANCHORCLIENT_H +#define CEPH_ANCHORCLIENT_H #include "MDSTableClient.h" #include "Anchor.h" diff --git a/src/mds/AnchorServer.h b/src/mds/AnchorServer.h index cf0dc3043e7..d594cba0329 100644 --- a/src/mds/AnchorServer.h +++ b/src/mds/AnchorServer.h @@ -12,8 +12,8 @@ * */ -#ifndef __ANCHORSERVER_H -#define __ANCHORSERVER_H +#ifndef CEPH_ANCHORSERVER_H +#define CEPH_ANCHORSERVER_H #include "MDSTableServer.h" #include "Anchor.h" diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h index ea04a4c52bf..0971156b060 100644 --- a/src/mds/CDentry.h +++ b/src/mds/CDentry.h @@ -14,8 +14,8 @@ -#ifndef __CDENTRY_H -#define __CDENTRY_H +#ifndef CEPH_CDENTRY_H +#define CEPH_CDENTRY_H #include <string> #include <set> diff --git a/src/mds/CDir.h b/src/mds/CDir.h index 96e36e57e3d..18ee0785eac 100644 --- a/src/mds/CDir.h +++ b/src/mds/CDir.h @@ -14,8 +14,8 @@ -#ifndef __CDIR_H -#define __CDIR_H +#ifndef CEPH_CDIR_H +#define CEPH_CDIR_H #include "include/types.h" #include "include/buffer.h" diff --git a/src/mds/CInode.h b/src/mds/CInode.h index b013a225a2b..2d6d0e903ef 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -14,8 +14,8 @@ -#ifndef __CINODE_H -#define __CINODE_H +#ifndef CEPH_CINODE_H +#define CEPH_CINODE_H #include "config.h" #include "include/dlist.h" diff --git a/src/mds/Capability.h b/src/mds/Capability.h index bec9d9e1fc8..8bc5c90faa3 100644 --- a/src/mds/Capability.h +++ b/src/mds/Capability.h @@ -13,8 +13,8 @@ */ -#ifndef __CAPABILITY_H -#define __CAPABILITY_H +#ifndef CEPH_CAPABILITY_H +#define CEPH_CAPABILITY_H #include "include/buffer.h" #include "include/xlist.h" diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h index dc44618f6a5..ec74cc74646 100644 --- a/src/mds/InoTable.h +++ b/src/mds/InoTable.h @@ -13,8 +13,8 @@ */ -#ifndef __INOTABLE_H -#define __INOTABLE_H +#ifndef CEPH_INOTABLE_H +#define CEPH_INOTABLE_H #include "MDSTable.h" #include "include/interval_set.h" diff --git a/src/mds/LocalLock.h b/src/mds/LocalLock.h index feac042291d..70450e39592 100644 --- a/src/mds/LocalLock.h +++ b/src/mds/LocalLock.h @@ -13,8 +13,8 @@ */ -#ifndef __LOCALLOCK_H -#define __LOCALLOCK_H +#ifndef CEPH_LOCALLOCK_H +#define CEPH_LOCALLOCK_H #include "SimpleLock.h" diff --git a/src/mds/Locker.h b/src/mds/Locker.h index 6dcb3c2b689..3edc537b738 100644 --- a/src/mds/Locker.h +++ b/src/mds/Locker.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_LOCKER_H -#define __MDS_LOCKER_H +#ifndef CEPH_MDS_LOCKER_H +#define CEPH_MDS_LOCKER_H #include "include/types.h" diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h index 64e7e4fad9d..1a87efe60a6 100644 --- a/src/mds/LogEvent.h +++ b/src/mds/LogEvent.h @@ -12,8 +12,8 @@ * */ -#ifndef __LOGEVENT_H -#define __LOGEVENT_H +#ifndef CEPH_LOGEVENT_H +#define CEPH_LOGEVENT_H #define EVENT_STRING 1 diff --git a/src/mds/LogSegment.h b/src/mds/LogSegment.h index ed34be6c47d..0ed46f40049 100644 --- a/src/mds/LogSegment.h +++ b/src/mds/LogSegment.h @@ -12,8 +12,8 @@ * */ -#ifndef __LOGSEGMENT_H -#define __LOGSEGMENT_H +#ifndef CEPH_LOGSEGMENT_H +#define CEPH_LOGSEGMENT_H #include "include/dlist.h" #include "include/elist.h" diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h index cdcc87d14ff..d5685584de4 100644 --- a/src/mds/MDBalancer.h +++ b/src/mds/MDBalancer.h @@ -14,8 +14,8 @@ -#ifndef __MDBALANCER_H -#define __MDBALANCER_H +#ifndef CEPH_MDBALANCER_H +#define CEPH_MDBALANCER_H #include <list> #include <map> diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index d8fd7f8666a..79f5442b67d 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -14,8 +14,8 @@ -#ifndef __MDCACHE_H -#define __MDCACHE_H +#ifndef CEPH_MDCACHE_H +#define CEPH_MDCACHE_H #include "include/types.h" #include "include/filepath.h" diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h index a53ac62154e..1458acf96b2 100644 --- a/src/mds/MDLog.h +++ b/src/mds/MDLog.h @@ -13,8 +13,8 @@ */ -#ifndef __MDLOG_H -#define __MDLOG_H +#ifndef CEPH_MDLOG_H +#define CEPH_MDLOG_H enum { l_mdl_first = 5000, diff --git a/src/mds/MDS.h b/src/mds/MDS.h index 3684c615f5e..6384c4ba532 100644 --- a/src/mds/MDS.h +++ b/src/mds/MDS.h @@ -14,8 +14,8 @@ -#ifndef __MDS_H -#define __MDS_H +#ifndef CEPH_MDS_H +#define CEPH_MDS_H #include "mdstypes.h" diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index a26472feaed..b4355f15116 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -13,8 +13,8 @@ */ -#ifndef __MDSMAP_H -#define __MDSMAP_H +#ifndef CEPH_MDSMAP_H +#define CEPH_MDSMAP_H #include "include/types.h" #include "common/Clock.h" diff --git a/src/mds/MDSTable.h b/src/mds/MDSTable.h index da3fc374801..42225651522 100644 --- a/src/mds/MDSTable.h +++ b/src/mds/MDSTable.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDSTABLE_H -#define __MDSTABLE_H +#ifndef CEPH_MDSTABLE_H +#define CEPH_MDSTABLE_H #include "mdstypes.h" #include "mds_table_types.h" diff --git a/src/mds/MDSTableClient.h b/src/mds/MDSTableClient.h index 0ffdf980fd4..e15837f26a1 100644 --- a/src/mds/MDSTableClient.h +++ b/src/mds/MDSTableClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDSTABLECLIENT_H -#define __MDSTABLECLIENT_H +#ifndef CEPH_MDSTABLECLIENT_H +#define CEPH_MDSTABLECLIENT_H #include "include/types.h" #include "include/Context.h" diff --git a/src/mds/MDSTableServer.h b/src/mds/MDSTableServer.h index 0a3d2d43ae9..6e3601aa1db 100644 --- a/src/mds/MDSTableServer.h +++ b/src/mds/MDSTableServer.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDSTABLESERVER_H -#define __MDSTABLESERVER_H +#ifndef CEPH_MDSTABLESERVER_H +#define CEPH_MDSTABLESERVER_H #include "MDSTable.h" diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h index d39a96fdd20..4ad9de04d61 100644 --- a/src/mds/Migrator.h +++ b/src/mds/Migrator.h @@ -14,8 +14,8 @@ * See src/doc/exports.txt for a description. */ -#ifndef __MDS_MIGRATOR_H -#define __MDS_MIGRATOR_H +#ifndef CEPH_MDS_MIGRATOR_H +#define CEPH_MDS_MIGRATOR_H #include "include/types.h" diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h index d6cebc07504..ffcdbee4a2d 100644 --- a/src/mds/ScatterLock.h +++ b/src/mds/ScatterLock.h @@ -13,8 +13,8 @@ */ -#ifndef __SCATTERLOCK_H -#define __SCATTERLOCK_H +#ifndef CEPH_SCATTERLOCK_H +#define CEPH_SCATTERLOCK_H #include "SimpleLock.h" diff --git a/src/mds/Server.h b/src/mds/Server.h index f4b00542cfc..41f934f77d2 100644 --- a/src/mds/Server.h +++ b/src/mds/Server.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_SERVER_H -#define __MDS_SERVER_H +#ifndef CEPH_MDS_SERVER_H +#define CEPH_MDS_SERVER_H #include "MDS.h" diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index 1591f063787..08e73928755 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_SESSIONMAP_H -#define __MDS_SESSIONMAP_H +#ifndef CEPH_MDS_SESSIONMAP_H +#define CEPH_MDS_SESSIONMAP_H #include <set> using std::set; diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index 2e36095b2be..ed6585cdcd5 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -13,8 +13,8 @@ */ -#ifndef __SIMPLELOCK_H -#define __SIMPLELOCK_H +#ifndef CEPH_SIMPLELOCK_H +#define CEPH_SIMPLELOCK_H // -- lock types -- // see CEPH_LOCK_* diff --git a/src/mds/SnapClient.h b/src/mds/SnapClient.h index e995a30cfe6..fd52d2bf602 100644 --- a/src/mds/SnapClient.h +++ b/src/mds/SnapClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __SNAPCLIENT_H -#define __SNAPCLIENT_H +#ifndef CEPH_SNAPCLIENT_H +#define CEPH_SNAPCLIENT_H #include "MDSTableClient.h" #include "snap.h" diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h index 123243d212f..e75cc651fe7 100644 --- a/src/mds/SnapServer.h +++ b/src/mds/SnapServer.h @@ -12,8 +12,8 @@ * */ -#ifndef __SNAPSERVER_H -#define __SNAPSERVER_H +#ifndef CEPH_SNAPSERVER_H +#define CEPH_SNAPSERVER_H #include "MDSTableServer.h" #include "snap.h" diff --git a/src/mds/events/ECommitted.h b/src/mds/events/ECommitted.h index 98dc20d5557..e358656a631 100644 --- a/src/mds/events/ECommitted.h +++ b/src/mds/events/ECommitted.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ECOMMITTED_H -#define __MDS_ECOMMITTED_H +#ifndef CEPH_MDS_ECOMMITTED_H +#define CEPH_MDS_ECOMMITTED_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h index 6a1da49d8fd..9133b4bbb25 100644 --- a/src/mds/events/EExport.h +++ b/src/mds/events/EExport.h @@ -12,8 +12,8 @@ * */ -#ifndef __EEXPORT_H -#define __EEXPORT_H +#ifndef CEPH_EEXPORT_H +#define CEPH_EEXPORT_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h index c0128c94a1a..0a268c2cef9 100644 --- a/src/mds/events/EFragment.h +++ b/src/mds/events/EFragment.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_EFRAGMENT_H -#define __MDS_EFRAGMENT_H +#ifndef CEPH_MDS_EFRAGMENT_H +#define CEPH_MDS_EFRAGMENT_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/events/EImportFinish.h b/src/mds/events/EImportFinish.h index c931a6a895e..d5e18d6ce51 100644 --- a/src/mds/events/EImportFinish.h +++ b/src/mds/events/EImportFinish.h @@ -12,8 +12,8 @@ * */ -#ifndef __EIMPORTFINISH_H -#define __EIMPORTFINISH_H +#ifndef CEPH_EIMPORTFINISH_H +#define CEPH_EIMPORTFINISH_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h index b7496f18134..91e8523e666 100644 --- a/src/mds/events/EImportStart.h +++ b/src/mds/events/EImportStart.h @@ -12,8 +12,8 @@ * */ -#ifndef __EIMPORTSTART_H -#define __EIMPORTSTART_H +#ifndef CEPH_EIMPORTSTART_H +#define CEPH_EIMPORTSTART_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h index 67777f0c07b..83c20f21e01 100644 --- a/src/mds/events/EMetaBlob.h +++ b/src/mds/events/EMetaBlob.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_EMETABLOB_H -#define __MDS_EMETABLOB_H +#ifndef CEPH_MDS_EMETABLOB_H +#define CEPH_MDS_EMETABLOB_H #include <stdlib.h> diff --git a/src/mds/events/EOpen.h b/src/mds/events/EOpen.h index 8ecae6704e9..bb6bc3f6d5c 100644 --- a/src/mds/events/EOpen.h +++ b/src/mds/events/EOpen.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_EOPEN_H -#define __MDS_EOPEN_H +#ifndef CEPH_MDS_EOPEN_H +#define CEPH_MDS_EOPEN_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/events/ESession.h b/src/mds/events/ESession.h index 002a246d58f..d385f012a4a 100644 --- a/src/mds/events/ESession.h +++ b/src/mds/events/ESession.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ESESSION_H -#define __MDS_ESESSION_H +#ifndef CEPH_MDS_ESESSION_H +#define CEPH_MDS_ESESSION_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/ESessions.h b/src/mds/events/ESessions.h index d05fdef5f33..4b5a81c74ff 100644 --- a/src/mds/events/ESessions.h +++ b/src/mds/events/ESessions.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ESESSIONS_H -#define __MDS_ESESSIONS_H +#ifndef CEPH_MDS_ESESSIONS_H +#define CEPH_MDS_ESESSIONS_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h index e1ff2812937..4ce505df5bc 100644 --- a/src/mds/events/ESlaveUpdate.h +++ b/src/mds/events/ESlaveUpdate.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ESLAVEUPDATE_H -#define __MDS_ESLAVEUPDATE_H +#ifndef CEPH_MDS_ESLAVEUPDATE_H +#define CEPH_MDS_ESLAVEUPDATE_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/events/EString.h b/src/mds/events/EString.h index 83d5d0c33fc..4a29a340d1b 100644 --- a/src/mds/events/EString.h +++ b/src/mds/events/EString.h @@ -13,8 +13,8 @@ */ -#ifndef __ESTRING_H -#define __ESTRING_H +#ifndef CEPH_ESTRING_H +#define CEPH_ESTRING_H #include <stdlib.h> #include <string> diff --git a/src/mds/events/ESubtreeMap.h b/src/mds/events/ESubtreeMap.h index 11254d7dc4c..964bbbf68e3 100644 --- a/src/mds/events/ESubtreeMap.h +++ b/src/mds/events/ESubtreeMap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ESUBTREEMAP_H -#define __MDS_ESUBTREEMAP_H +#ifndef CEPH_MDS_ESUBTREEMAP_H +#define CEPH_MDS_ESUBTREEMAP_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/events/ETableClient.h b/src/mds/events/ETableClient.h index 3a220087142..da573e07b6f 100644 --- a/src/mds/events/ETableClient.h +++ b/src/mds/events/ETableClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ETABLECLIENT_H -#define __MDS_ETABLECLIENT_H +#ifndef CEPH_MDS_ETABLECLIENT_H +#define CEPH_MDS_ETABLECLIENT_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h index a479efe2a86..8b6b936acea 100644 --- a/src/mds/events/ETableServer.h +++ b/src/mds/events/ETableServer.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_ETABLESERVER_H -#define __MDS_ETABLESERVER_H +#ifndef CEPH_MDS_ETABLESERVER_H +#define CEPH_MDS_ETABLESERVER_H #include "config.h" #include "include/types.h" diff --git a/src/mds/events/EUpdate.h b/src/mds/events/EUpdate.h index b92d210f1d8..c16eec60581 100644 --- a/src/mds/events/EUpdate.h +++ b/src/mds/events/EUpdate.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDS_EUPDATE_H -#define __MDS_EUPDATE_H +#ifndef CEPH_MDS_EUPDATE_H +#define CEPH_MDS_EUPDATE_H #include "../LogEvent.h" #include "EMetaBlob.h" diff --git a/src/mds/locks.h b/src/mds/locks.h index 53e372581a3..e569083016f 100644 --- a/src/mds/locks.h +++ b/src/mds/locks.h @@ -1,6 +1,6 @@ -#ifndef __CEPH_MDS_LOCKS_H -#define __CEPH_MDS_LOCKS_H +#ifndef CEPH_MDS_LOCKS_H +#define CEPH_MDS_LOCKS_H struct sm_state_t { int next; // 0 if stable diff --git a/src/mds/mds_table_types.h b/src/mds/mds_table_types.h index 6ad48828b24..b094c752565 100644 --- a/src/mds/mds_table_types.h +++ b/src/mds/mds_table_types.h @@ -12,8 +12,8 @@ * */ -#ifndef __MDSTABLETYPES_H -#define __MDSTABLETYPES_H +#ifndef CEPH_MDSTABLETYPES_H +#define CEPH_MDSTABLETYPES_H // MDS TABLES diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index 1b09417ae2f..f84c8a11891 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __MDSTYPES_H -#define __MDSTYPES_H +#ifndef CEPH_MDSTYPES_H +#define CEPH_MDSTYPES_H #include <math.h> diff --git a/src/mds/snap.h b/src/mds/snap.h index 9f2c6fbd49b..714d8fb5e47 100644 --- a/src/mds/snap.h +++ b/src/mds/snap.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_MDS_SNAP_H -#define __CEPH_MDS_SNAP_H +#ifndef CEPH_MDS_SNAP_H +#define CEPH_MDS_SNAP_H #include "mdstypes.h" #include "include/xlist.h" diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h index 732aa6f5bc3..89d7f705303 100644 --- a/src/messages/MAuth.h +++ b/src/messages/MAuth.h @@ -12,8 +12,8 @@ * */ -#ifndef __MAUTH_H -#define __MAUTH_H +#ifndef CEPH_MAUTH_H +#define CEPH_MAUTH_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h index c7eb2184ffb..ae620e2bbf8 100644 --- a/src/messages/MAuthReply.h +++ b/src/messages/MAuthReply.h @@ -12,8 +12,8 @@ * */ -#ifndef __MAUTHREPLY_H -#define __MAUTHREPLY_H +#ifndef CEPH_MAUTHREPLY_H +#define CEPH_MAUTHREPLY_H #include "msg/Message.h" diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h index 256fad8948d..ab32658c04d 100644 --- a/src/messages/MCacheExpire.h +++ b/src/messages/MCacheExpire.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCACHEEXPIRE_H -#define __MCACHEEXPIRE_H +#ifndef CEPH_MCACHEEXPIRE_H +#define CEPH_MCACHEEXPIRE_H class MCacheExpire : public Message { __s32 from; diff --git a/src/messages/MClass.h b/src/messages/MClass.h index 9d54e11484e..ced1b018121 100644 --- a/src/messages/MClass.h +++ b/src/messages/MClass.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLASS_H -#define __MCLASS_H +#ifndef CEPH_MCLASS_H +#define CEPH_MCLASS_H #include "include/ClassLibrary.h" #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MClassAck.h b/src/messages/MClassAck.h index 668944219e5..e2e6a478cfe 100644 --- a/src/messages/MClassAck.h +++ b/src/messages/MClassAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLASSACK_H -#define __MCLASSACK_H +#ifndef CEPH_MCLASSACK_H +#define CEPH_MCLASSACK_H #include "include/ClassLibrary.h" diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h index d2354510052..49d6a2eb814 100644 --- a/src/messages/MClientCapRelease.h +++ b/src/messages/MClientCapRelease.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLIENTCAPRELEASE_H -#define __MCLIENTCAPRELEASE_H +#ifndef CEPH_MCLIENTCAPRELEASE_H +#define CEPH_MCLIENTCAPRELEASE_H #include "msg/Message.h" diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h index 742c3612bf0..db46dfe0af9 100644 --- a/src/messages/MClientCaps.h +++ b/src/messages/MClientCaps.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLIENTCAPS_H -#define __MCLIENTCAPS_H +#ifndef CEPH_MCLIENTCAPS_H +#define CEPH_MCLIENTCAPS_H #include "msg/Message.h" diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h index b817cf2d548..0fd3946168e 100644 --- a/src/messages/MClientLease.h +++ b/src/messages/MClientLease.h @@ -13,8 +13,8 @@ */ -#ifndef __MCLIENTLEASE_H -#define __MCLIENTLEASE_H +#ifndef CEPH_MCLIENTLEASE_H +#define CEPH_MCLIENTLEASE_H #include "msg/Message.h" diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h index 771e5aa620d..eda623942c8 100644 --- a/src/messages/MClientReconnect.h +++ b/src/messages/MClientReconnect.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLIENTRECONNECT_H -#define __MCLIENTRECONNECT_H +#ifndef CEPH_MCLIENTRECONNECT_H +#define CEPH_MCLIENTRECONNECT_H #include "msg/Message.h" #include "mds/mdstypes.h" diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h index eaa0e475ba4..2ea4916e812 100644 --- a/src/messages/MClientReply.h +++ b/src/messages/MClientReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MCLIENTREPLY_H -#define __MCLIENTREPLY_H +#ifndef CEPH_MCLIENTREPLY_H +#define CEPH_MCLIENTREPLY_H #include "include/types.h" #include "MClientRequest.h" diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index 231cc2faed5..eeb69f0dfd2 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -13,8 +13,8 @@ */ -#ifndef __MCLIENTREQUEST_H -#define __MCLIENTREQUEST_H +#ifndef CEPH_MCLIENTREQUEST_H +#define CEPH_MCLIENTREQUEST_H /** * diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h index 856dd52293d..046eea46830 100644 --- a/src/messages/MClientRequestForward.h +++ b/src/messages/MClientRequestForward.h @@ -13,8 +13,8 @@ */ -#ifndef __MCLIENTREQUESTFORWARD_H -#define __MCLIENTREQUESTFORWARD_H +#ifndef CEPH_MCLIENTREQUESTFORWARD_H +#define CEPH_MCLIENTREQUESTFORWARD_H class MClientRequestForward : public Message { int32_t dest_mds; diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h index 47eae7a7fc2..7f9f31aa3f1 100644 --- a/src/messages/MClientSession.h +++ b/src/messages/MClientSession.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLIENTSESSION_H -#define __MCLIENTSESSION_H +#ifndef CEPH_MCLIENTSESSION_H +#define CEPH_MCLIENTSESSION_H #include "msg/Message.h" diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h index 77f8657e1ac..80226ba3719 100644 --- a/src/messages/MClientSnap.h +++ b/src/messages/MClientSnap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MCLIENTSNAP_H -#define __MCLIENTSNAP_H +#ifndef CEPH_MCLIENTSNAP_H +#define CEPH_MCLIENTSNAP_H #include "msg/Message.h" diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h index 223c635ab44..7468691e41a 100644 --- a/src/messages/MDentryLink.h +++ b/src/messages/MDentryLink.h @@ -13,8 +13,8 @@ */ -#ifndef __MDENTRYLINK_H -#define __MDENTRYLINK_H +#ifndef CEPH_MDENTRYLINK_H +#define CEPH_MDENTRYLINK_H class MDentryLink : public Message { dirfrag_t dirfrag; diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h index c857d7bffaf..a2162d0ab22 100644 --- a/src/messages/MDentryUnlink.h +++ b/src/messages/MDentryUnlink.h @@ -13,8 +13,8 @@ */ -#ifndef __MDENTRYUNLINK_H -#define __MDENTRYUNLINK_H +#ifndef CEPH_MDENTRYUNLINK_H +#define CEPH_MDENTRYUNLINK_H class MDentryUnlink : public Message { dirfrag_t dirfrag; diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h index 1d68161b2a2..f58e32eb210 100644 --- a/src/messages/MDirUpdate.h +++ b/src/messages/MDirUpdate.h @@ -13,8 +13,8 @@ */ -#ifndef __MDIRUPDATE_H -#define __MDIRUPDATE_H +#ifndef CEPH_MDIRUPDATE_H +#define CEPH_MDIRUPDATE_H #include "msg/Message.h" diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h index 53d05557ac6..a27d0aee83c 100644 --- a/src/messages/MDiscover.h +++ b/src/messages/MDiscover.h @@ -13,8 +13,8 @@ */ -#ifndef __MDISCOVER_H -#define __MDISCOVER_H +#ifndef CEPH_MDISCOVER_H +#define CEPH_MDISCOVER_H #include "msg/Message.h" #include "include/filepath.h" diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h index b946e5910e7..d93ea9f03e2 100644 --- a/src/messages/MDiscoverReply.h +++ b/src/messages/MDiscoverReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MDISCOVERREPLY_H -#define __MDISCOVERREPLY_H +#ifndef CEPH_MDISCOVERREPLY_H +#define CEPH_MDISCOVERREPLY_H #include "msg/Message.h" #include "include/filepath.h" diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h index 2cf760399e5..d8137abfbab 100644 --- a/src/messages/MExportCaps.h +++ b/src/messages/MExportCaps.h @@ -13,8 +13,8 @@ */ -#ifndef __MEXPORTCAPS_H -#define __MEXPORTCAPS_H +#ifndef CEPH_MEXPORTCAPS_H +#define CEPH_MEXPORTCAPS_H #include "msg/Message.h" diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h index f13682934bc..83f20209d7c 100644 --- a/src/messages/MExportCapsAck.h +++ b/src/messages/MExportCapsAck.h @@ -13,8 +13,8 @@ */ -#ifndef __MEXPORTCAPSACK_H -#define __MEXPORTCAPSACK_H +#ifndef CEPH_MEXPORTCAPSACK_H +#define CEPH_MEXPORTCAPSACK_H #include "msg/Message.h" diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h index acb920f43f6..fc6d35fa7a3 100644 --- a/src/messages/MExportDir.h +++ b/src/messages/MExportDir.h @@ -13,8 +13,8 @@ */ -#ifndef __MEXPORTDIR_H -#define __MEXPORTDIR_H +#ifndef CEPH_MEXPORTDIR_H +#define CEPH_MEXPORTDIR_H #include "msg/Message.h" diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h index 25a64d894c9..57fbf0ab950 100644 --- a/src/messages/MExportDirAck.h +++ b/src/messages/MExportDirAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRACK_H -#define __MEXPORTDIRACK_H +#ifndef CEPH_MEXPORTDIRACK_H +#define CEPH_MEXPORTDIRACK_H #include "MExportDir.h" diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h index ee3155c4b69..1ffec3644b7 100644 --- a/src/messages/MExportDirCancel.h +++ b/src/messages/MExportDirCancel.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRCANCEL_H -#define __MEXPORTDIRCANCEL_H +#ifndef CEPH_MEXPORTDIRCANCEL_H +#define CEPH_MEXPORTDIRCANCEL_H #include "msg/Message.h" #include "include/types.h" diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h index ef789c69ea3..ea9d5df12bc 100644 --- a/src/messages/MExportDirDiscover.h +++ b/src/messages/MExportDirDiscover.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRDISCOVER_H -#define __MEXPORTDIRDISCOVER_H +#ifndef CEPH_MEXPORTDIRDISCOVER_H +#define CEPH_MEXPORTDIRDISCOVER_H #include "msg/Message.h" #include "include/types.h" diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h index bf492bf0fef..2272c853ce5 100644 --- a/src/messages/MExportDirDiscoverAck.h +++ b/src/messages/MExportDirDiscoverAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRDISCOVERACK_H -#define __MEXPORTDIRDISCOVERACK_H +#ifndef CEPH_MEXPORTDIRDISCOVERACK_H +#define CEPH_MEXPORTDIRDISCOVERACK_H #include "msg/Message.h" #include "include/types.h" diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h index 06ce66eb9d6..e5b7646dd67 100644 --- a/src/messages/MExportDirFinish.h +++ b/src/messages/MExportDirFinish.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRFINISH_H -#define __MEXPORTDIRFINISH_H +#ifndef CEPH_MEXPORTDIRFINISH_H +#define CEPH_MEXPORTDIRFINISH_H #include "msg/Message.h" diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h index 18e1a2bd635..bed2a6655ee 100644 --- a/src/messages/MExportDirNotify.h +++ b/src/messages/MExportDirNotify.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRNOTIFY_H -#define __MEXPORTDIRNOTIFY_H +#ifndef CEPH_MEXPORTDIRNOTIFY_H +#define CEPH_MEXPORTDIRNOTIFY_H #include "msg/Message.h" #include <string> diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h index 0e3dd708311..714bbe97a2f 100644 --- a/src/messages/MExportDirNotifyAck.h +++ b/src/messages/MExportDirNotifyAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRNOTIFYACK_H -#define __MEXPORTDIRNOTIFYACK_H +#ifndef CEPH_MEXPORTDIRNOTIFYACK_H +#define CEPH_MEXPORTDIRNOTIFYACK_H #include "msg/Message.h" #include <string> diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h index e4399713ed0..000ff610aed 100644 --- a/src/messages/MExportDirPrep.h +++ b/src/messages/MExportDirPrep.h @@ -13,8 +13,8 @@ */ -#ifndef __MEXPORTDIRPREP_H -#define __MEXPORTDIRPREP_H +#ifndef CEPH_MEXPORTDIRPREP_H +#define CEPH_MEXPORTDIRPREP_H #include "msg/Message.h" #include "include/types.h" diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h index f5cbb9b4b00..c6eacb3f4f9 100644 --- a/src/messages/MExportDirPrepAck.h +++ b/src/messages/MExportDirPrepAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MEXPORTDIRPREPACK_H -#define __MEXPORTDIRPREPACK_H +#ifndef CEPH_MEXPORTDIRPREPACK_H +#define CEPH_MEXPORTDIRPREPACK_H #include "msg/Message.h" #include "include/types.h" diff --git a/src/messages/MForward.h b/src/messages/MForward.h index 416cc485c80..79ca9116303 100644 --- a/src/messages/MForward.h +++ b/src/messages/MForward.h @@ -16,8 +16,8 @@ * checking. */ -#ifndef __MFORWARD_H -#define __MFORWARD_H +#ifndef CEPH_MFORWARD_H +#define CEPH_MFORWARD_H #include "msg/Message.h" #include "mon/MonCaps.h" diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h index 83918819350..305ea306a95 100644 --- a/src/messages/MGenericMessage.h +++ b/src/messages/MGenericMessage.h @@ -13,8 +13,8 @@ */ -#ifndef __MGENERICMESSAGE_H -#define __MGENERICMESSAGE_H +#ifndef CEPH_MGENERICMESSAGE_H +#define CEPH_MGENERICMESSAGE_H #include "msg/Message.h" diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h index 7e5dda7f3de..9ba3907cbcd 100644 --- a/src/messages/MGetPoolStats.h +++ b/src/messages/MGetPoolStats.h @@ -13,8 +13,8 @@ */ -#ifndef __MGETPOOLSTATS_H -#define __MGETPOOLSTATS_H +#ifndef CEPH_MGETPOOLSTATS_H +#define CEPH_MGETPOOLSTATS_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h index ab5b770d538..de6c4b5664e 100644 --- a/src/messages/MGetPoolStatsReply.h +++ b/src/messages/MGetPoolStatsReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MGETPOOLSTATSREPLY_H -#define __MGETPOOLSTATSREPLY_H +#ifndef CEPH_MGETPOOLSTATSREPLY_H +#define CEPH_MGETPOOLSTATSREPLY_H class MGetPoolStatsReply : public PaxosServiceMessage { public: diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h index 7cf82cf5e5f..17551e73708 100644 --- a/src/messages/MHeartbeat.h +++ b/src/messages/MHeartbeat.h @@ -13,8 +13,8 @@ */ -#ifndef __MHEARTBEAT_H -#define __MHEARTBEAT_H +#ifndef CEPH_MHEARTBEAT_H +#define CEPH_MHEARTBEAT_H #include "include/types.h" #include "msg/Message.h" diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h index 775d011a0eb..8b24aac4075 100644 --- a/src/messages/MInodeFileCaps.h +++ b/src/messages/MInodeFileCaps.h @@ -13,8 +13,8 @@ */ -#ifndef __MINODEFILECAPS_H -#define __MINODEFILECAPS_H +#ifndef CEPH_MINODEFILECAPS_H +#define CEPH_MINODEFILECAPS_H class MInodeFileCaps : public Message { inodeno_t ino; diff --git a/src/messages/MLock.h b/src/messages/MLock.h index 78cd83adb32..5069aadcf4a 100644 --- a/src/messages/MLock.h +++ b/src/messages/MLock.h @@ -13,8 +13,8 @@ */ -#ifndef __MLOCK_H -#define __MLOCK_H +#ifndef CEPH_MLOCK_H +#define CEPH_MLOCK_H #include "msg/Message.h" #include "mds/locks.h" diff --git a/src/messages/MLog.h b/src/messages/MLog.h index eee41aaa618..2a6fab5c1cd 100644 --- a/src/messages/MLog.h +++ b/src/messages/MLog.h @@ -12,8 +12,8 @@ * */ -#ifndef __MLOG_H -#define __MLOG_H +#ifndef CEPH_MLOG_H +#define CEPH_MLOG_H #include "include/LogEntry.h" #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h index f70c8843fc3..1617096230d 100644 --- a/src/messages/MLogAck.h +++ b/src/messages/MLogAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MLOGACK_H -#define __MLOGACK_H +#ifndef CEPH_MLOGACK_H +#define CEPH_MLOGACK_H #include "include/LogEntry.h" diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h index 62a44667b2c..e6c2dfafb6a 100644 --- a/src/messages/MMDSBeacon.h +++ b/src/messages/MMDSBeacon.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSBEACON_H -#define __MMDSBEACON_H +#ifndef CEPH_MMDSBEACON_H +#define CEPH_MMDSBEACON_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h index c469e2a48d6..adcd526ed61 100644 --- a/src/messages/MMDSCacheRejoin.h +++ b/src/messages/MMDSCacheRejoin.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSCACHEREJOIN_H -#define __MMDSCACHEREJOIN_H +#ifndef CEPH_MMDSCACHEREJOIN_H +#define CEPH_MMDSCACHEREJOIN_H #include "msg/Message.h" diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h index 72c8b808f35..662614c09bc 100644 --- a/src/messages/MMDSFragmentNotify.h +++ b/src/messages/MMDSFragmentNotify.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSFRAGMENTNOTIFY_H -#define __MMDSFRAGMENTNOTIFY_H +#ifndef CEPH_MMDSFRAGMENTNOTIFY_H +#define CEPH_MMDSFRAGMENTNOTIFY_H #include "msg/Message.h" #include <string> diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h index d963bdfd79f..e207372276a 100644 --- a/src/messages/MMDSLoadTargets.h +++ b/src/messages/MMDSLoadTargets.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSLoadTargets_H -#define __MMDSLoadTargets_H +#ifndef CEPH_MMDSLoadTargets_H +#define CEPH_MMDSLoadTargets_H #include "msg/Message.h" #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h index 4fcc134f67f..c41183d03d5 100644 --- a/src/messages/MMDSMap.h +++ b/src/messages/MMDSMap.h @@ -13,8 +13,8 @@ */ -#ifndef __MMDSMAP_H -#define __MMDSMAP_H +#ifndef CEPH_MMDSMAP_H +#define CEPH_MMDSMAP_H #include "msg/Message.h" #include "mds/MDSMap.h" diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h index 05af24106f8..747f9a67bb3 100644 --- a/src/messages/MMDSResolve.h +++ b/src/messages/MMDSResolve.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSRESOLVE_H -#define __MMDSRESOLVE_H +#ifndef CEPH_MMDSRESOLVE_H +#define CEPH_MMDSRESOLVE_H #include "msg/Message.h" diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h index 242ef07bc16..da9a7a2ca00 100644 --- a/src/messages/MMDSResolveAck.h +++ b/src/messages/MMDSResolveAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMDSRESOLVEACK_H -#define __MMDSRESOLVEACK_H +#ifndef CEPH_MMDSRESOLVEACK_H +#define CEPH_MMDSRESOLVEACK_H #include "msg/Message.h" diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h index 64e90183b5a..6ebbe00c70c 100644 --- a/src/messages/MMDSSlaveRequest.h +++ b/src/messages/MMDSSlaveRequest.h @@ -13,8 +13,8 @@ */ -#ifndef __MMDSSLAVEREQUEST_H -#define __MMDSSLAVEREQUEST_H +#ifndef CEPH_MMDSSLAVEREQUEST_H +#define CEPH_MMDSSLAVEREQUEST_H #include "msg/Message.h" #include "mds/mdstypes.h" diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h index e279cb0f67a..c3f7c860e1f 100644 --- a/src/messages/MMDSTableRequest.h +++ b/src/messages/MMDSTableRequest.h @@ -13,8 +13,8 @@ */ -#ifndef __MMDSTABLEREQUEST_H -#define __MMDSTABLEREQUEST_H +#ifndef CEPH_MMDSTABLEREQUEST_H +#define CEPH_MMDSTABLEREQUEST_H #include "msg/Message.h" #include "mds/mds_table_types.h" diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h index 862a5072303..5a97d9c8330 100644 --- a/src/messages/MMonCommand.h +++ b/src/messages/MMonCommand.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONCOMMAND_H -#define __MMONCOMMAND_H +#ifndef CEPH_MMONCOMMAND_H +#define CEPH_MMONCOMMAND_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h index fd2ee265019..58aa08d3423 100644 --- a/src/messages/MMonCommandAck.h +++ b/src/messages/MMonCommandAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONCOMMANDACK_H -#define __MMONCOMMANDACK_H +#ifndef CEPH_MMONCOMMANDACK_H +#define CEPH_MMONCOMMANDACK_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h index bbe9a23a381..4398dd5ee33 100644 --- a/src/messages/MMonElection.h +++ b/src/messages/MMonElection.h @@ -13,8 +13,8 @@ */ -#ifndef __MMONELECTION_H -#define __MMONELECTION_H +#ifndef CEPH_MMONELECTION_H +#define CEPH_MMONELECTION_H #include "msg/Message.h" #include "mon/MonMap.h" diff --git a/src/messages/MMonGetMap.h b/src/messages/MMonGetMap.h index 450e01c6cb2..59ca1d6022d 100644 --- a/src/messages/MMonGetMap.h +++ b/src/messages/MMonGetMap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONGETMAP_H -#define __MMONGETMAP_H +#ifndef CEPH_MMONGETMAP_H +#define CEPH_MMONGETMAP_H #include "msg/Message.h" diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h index d9fb08de83c..45489c7258a 100644 --- a/src/messages/MMonGlobalID.h +++ b/src/messages/MMonGlobalID.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONGLOBALID_H -#define __MMONGLOBALID_H +#ifndef CEPH_MMONGLOBALID_H +#define CEPH_MMONGLOBALID_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h index 9717388d465..14bf5220e1d 100644 --- a/src/messages/MMonMap.h +++ b/src/messages/MMonMap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONMAP_H -#define __MMONMAP_H +#ifndef CEPH_MMONMAP_H +#define CEPH_MMONMAP_H #include "msg/Message.h" diff --git a/src/messages/MMonObserve.h b/src/messages/MMonObserve.h index ca2c14c97eb..4ec4fb4998f 100644 --- a/src/messages/MMonObserve.h +++ b/src/messages/MMonObserve.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONOBSERVE_H -#define __MMONOBSERVE_H +#ifndef CEPH_MMONOBSERVE_H +#define CEPH_MMONOBSERVE_H #include "msg/Message.h" diff --git a/src/messages/MMonObserveNotify.h b/src/messages/MMonObserveNotify.h index bcbad26afd8..034b6799fa9 100644 --- a/src/messages/MMonObserveNotify.h +++ b/src/messages/MMonObserveNotify.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONOBSERVENOTIFY_H -#define __MMONOBSERVENOTIFY_H +#ifndef CEPH_MMONOBSERVENOTIFY_H +#define CEPH_MMONOBSERVENOTIFY_H #include "msg/Message.h" diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h index eb8d6c4a105..01c3d3635c8 100644 --- a/src/messages/MMonPaxos.h +++ b/src/messages/MMonPaxos.h @@ -13,8 +13,8 @@ */ -#ifndef __MMONPAXOS_H -#define __MMONPAXOS_H +#ifndef CEPH_MMONPAXOS_H +#define CEPH_MMONPAXOS_H #include "messages/PaxosServiceMessage.h" #include "mon/mon_types.h" diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h index 702e17f6b13..a57f759af71 100644 --- a/src/messages/MMonSubscribe.h +++ b/src/messages/MMonSubscribe.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONSUBSCRIBE_H -#define __MMONSUBSCRIBE_H +#ifndef CEPH_MMONSUBSCRIBE_H +#define CEPH_MMONSUBSCRIBE_H #include "msg/Message.h" diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h index b57355f0e1f..dff6de1e89b 100644 --- a/src/messages/MMonSubscribeAck.h +++ b/src/messages/MMonSubscribeAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MMONSUBSCRIBEACK_H -#define __MMONSUBSCRIBEACK_H +#ifndef CEPH_MMONSUBSCRIBEACK_H +#define CEPH_MMONSUBSCRIBEACK_H #include "msg/Message.h" diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h index 85f461da659..9dcae67b347 100644 --- a/src/messages/MOSDAlive.h +++ b/src/messages/MOSDAlive.h @@ -14,8 +14,8 @@ -#ifndef __MOSDALIVE_H -#define __MOSDALIVE_H +#ifndef CEPH_MOSDALIVE_H +#define CEPH_MOSDALIVE_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h index ae69c232235..c3ab1357517 100644 --- a/src/messages/MOSDBoot.h +++ b/src/messages/MOSDBoot.h @@ -12,8 +12,8 @@ * */ -#ifndef __MOSDBOOT_H -#define __MOSDBOOT_H +#ifndef CEPH_MOSDBOOT_H +#define CEPH_MOSDBOOT_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h index fda1ee3ae2e..111e3c1d7f3 100644 --- a/src/messages/MOSDFailure.h +++ b/src/messages/MOSDFailure.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDFAILURE_H -#define __MOSDFAILURE_H +#ifndef CEPH_MOSDFAILURE_H +#define CEPH_MOSDFAILURE_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index 1f39d6b1445..39d938933de 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDMAP_H -#define __MOSDMAP_H +#ifndef CEPH_MOSDMAP_H +#define CEPH_MOSDMAP_H #include "msg/Message.h" #include "osd/OSDMap.h" diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index c92e2c5781d..75a9cbb0499 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDOP_H -#define __MOSDOP_H +#ifndef CEPH_MOSDOP_H +#define CEPH_MOSDOP_H #include "msg/Message.h" #include "osd/osd_types.h" diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index 3bb68064950..a3ef19f84c0 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDOPREPLY_H -#define __MOSDOPREPLY_H +#ifndef CEPH_MOSDOPREPLY_H +#define CEPH_MOSDOPREPLY_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h index 0759aca26e3..5ec5f2f993c 100644 --- a/src/messages/MOSDPGCreate.h +++ b/src/messages/MOSDPGCreate.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDPGCREATE_H -#define __MOSDPGCREATE_H +#ifndef CEPH_MOSDPGCREATE_H +#define CEPH_MOSDPGCREATE_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index 6f82b496670..886216a42a0 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDPGINFO_H -#define __MOSDPGINFO_H +#ifndef CEPH_MOSDPGINFO_H +#define CEPH_MOSDPGINFO_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index b5c62d921f1..384319f6163 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDPGLOG_H -#define __MOSDPGLOG_H +#ifndef CEPH_MOSDPGLOG_H +#define CEPH_MOSDPGLOG_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h index 228d9918137..ce4f92d6467 100644 --- a/src/messages/MOSDPGNotify.h +++ b/src/messages/MOSDPGNotify.h @@ -12,8 +12,8 @@ * */ -#ifndef __MOSDPGPEERNOTIFY_H -#define __MOSDPGPEERNOTIFY_H +#ifndef CEPH_MOSDPGPEERNOTIFY_H +#define CEPH_MOSDPGPEERNOTIFY_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h index 0e57c7c7851..6fffc0892c5 100644 --- a/src/messages/MOSDPGQuery.h +++ b/src/messages/MOSDPGQuery.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDPGQUERY_H -#define __MOSDPGQUERY_H +#ifndef CEPH_MOSDPGQUERY_H +#define CEPH_MOSDPGQUERY_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h index d5d312032db..f6acf4cf0a9 100644 --- a/src/messages/MOSDPGRemove.h +++ b/src/messages/MOSDPGRemove.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDPGREMOVE_H -#define __MOSDPGREMOVE_H +#ifndef CEPH_MOSDPGREMOVE_H +#define CEPH_MOSDPGREMOVE_H #include "msg/Message.h" diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h index b9c2df2ef40..2f28423cf7d 100644 --- a/src/messages/MOSDPGTemp.h +++ b/src/messages/MOSDPGTemp.h @@ -14,8 +14,8 @@ -#ifndef __MOSDPGTEMP_H -#define __MOSDPGTEMP_H +#ifndef CEPH_MOSDPGTEMP_H +#define CEPH_MOSDPGTEMP_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h index 94241026eb0..4592a4ad83e 100644 --- a/src/messages/MOSDPGTrim.h +++ b/src/messages/MOSDPGTrim.h @@ -12,8 +12,8 @@ * */ -#ifndef __MOSDPGTRIM_H -#define __MOSDPGTRIM_H +#ifndef CEPH_MOSDPGTRIM_H +#define CEPH_MOSDPGTRIM_H #include "msg/Message.h" diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h index fd707206331..07f763319c7 100644 --- a/src/messages/MOSDPing.h +++ b/src/messages/MOSDPing.h @@ -12,8 +12,8 @@ * */ -#ifndef __MOSDPING_H -#define __MOSDPING_H +#ifndef CEPH_MOSDPING_H +#define CEPH_MOSDPING_H #include "common/Clock.h" diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h index b3e5d6acf26..d3c3eafbf29 100644 --- a/src/messages/MOSDScrub.h +++ b/src/messages/MOSDScrub.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDSCRUB_H -#define __MOSDSCRUB_H +#ifndef CEPH_MOSDSCRUB_H +#define CEPH_MOSDSCRUB_H #include "msg/Message.h" diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h index b28d8d6600b..e4aecf8b114 100644 --- a/src/messages/MOSDSubOp.h +++ b/src/messages/MOSDSubOp.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDSUBOP_H -#define __MOSDSUBOP_H +#ifndef CEPH_MOSDSUBOP_H +#define CEPH_MOSDSUBOP_H #include "msg/Message.h" #include "osd/osd_types.h" diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h index 3e9798d781c..fffe722aaf7 100644 --- a/src/messages/MOSDSubOpReply.h +++ b/src/messages/MOSDSubOpReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MOSDSUBOPREPLY_H -#define __MOSDSUBOPREPLY_H +#ifndef CEPH_MOSDSUBOPREPLY_H +#define CEPH_MOSDSUBOPREPLY_H #include "msg/Message.h" diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index b7b099feb91..883ecc322c9 100644 --- a/src/messages/MPGStats.h +++ b/src/messages/MPGStats.h @@ -12,8 +12,8 @@ * */ -#ifndef __MPGSTATS_H -#define __MPGSTATS_H +#ifndef CEPH_MPGSTATS_H +#define CEPH_MPGSTATS_H #include "osd/osd_types.h" #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h index 1b30f52f953..808f4b726b6 100644 --- a/src/messages/MPGStatsAck.h +++ b/src/messages/MPGStatsAck.h @@ -12,8 +12,8 @@ * */ -#ifndef __MPGSTATSACK_H -#define __MPGSTATSACK_H +#ifndef CEPH_MPGSTATSACK_H +#define CEPH_MPGSTATSACK_H #include "osd/osd_types.h" diff --git a/src/messages/MPing.h b/src/messages/MPing.h index 1c0082ce93f..6788066ce99 100644 --- a/src/messages/MPing.h +++ b/src/messages/MPing.h @@ -14,8 +14,8 @@ -#ifndef __MPING_H -#define __MPING_H +#ifndef CEPH_MPING_H +#define CEPH_MPING_H #include "msg/Message.h" #include "include/encoding.h" diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h index 0621a9824aa..18a4b48a242 100644 --- a/src/messages/MPoolOp.h +++ b/src/messages/MPoolOp.h @@ -12,8 +12,8 @@ * */ -#ifndef __MPOOLOP_H -#define __MPOOLOP_H +#ifndef CEPH_MPOOLOP_H +#define CEPH_MPOOLOP_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h index 7da004de76e..e1b64f252ca 100644 --- a/src/messages/MPoolOpReply.h +++ b/src/messages/MPoolOpReply.h @@ -12,8 +12,8 @@ * */ -#ifndef __MPOOLOPREPLY_H -#define __MPOOLOPREPLY_H +#ifndef CEPH_MPOOLOPREPLY_H +#define CEPH_MPOOLOPREPLY_H class MPoolOpReply : public PaxosServiceMessage { diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h index 9eaf78086d4..a201455d197 100644 --- a/src/messages/MRemoveSnaps.h +++ b/src/messages/MRemoveSnaps.h @@ -12,8 +12,8 @@ * */ -#ifndef __MREMOVESNAPS_H -#define __MREMOVESNAPS_H +#ifndef CEPH_MREMOVESNAPS_H +#define CEPH_MREMOVESNAPS_H #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h index 4ca1b95b7f0..b35153119a0 100644 --- a/src/messages/MRoute.h +++ b/src/messages/MRoute.h @@ -14,8 +14,8 @@ -#ifndef __MROUTE_H -#define __MROUTE_H +#ifndef CEPH_MROUTE_H +#define CEPH_MROUTE_H #include "msg/Message.h" #include "include/encoding.h" diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h index 484bf63e0cb..94eb4b7a4e7 100644 --- a/src/messages/MStatfs.h +++ b/src/messages/MStatfs.h @@ -13,8 +13,8 @@ */ -#ifndef __MSTATFS_H -#define __MSTATFS_H +#ifndef CEPH_MSTATFS_H +#define CEPH_MSTATFS_H #include <sys/statvfs.h> /* or <sys/statfs.h> */ #include "messages/PaxosServiceMessage.h" diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h index 977958646ba..3e42d4716a0 100644 --- a/src/messages/MStatfsReply.h +++ b/src/messages/MStatfsReply.h @@ -13,8 +13,8 @@ */ -#ifndef __MSTATFSREPLY_H -#define __MSTATFSREPLY_H +#ifndef CEPH_MSTATFSREPLY_H +#define CEPH_MSTATFSREPLY_H class MStatfsReply : public Message { public: diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h index 2a176d33def..cebc0c88c93 100644 --- a/src/messages/PaxosServiceMessage.h +++ b/src/messages/PaxosServiceMessage.h @@ -1,5 +1,5 @@ -#ifndef __PAXOSSERVICEMESSAGE_H -#define __PAXOSSERVICEMESSAGE_H +#ifndef CEPH_PAXOSSERVICEMESSAGE_H +#define CEPH_PAXOSSERVICEMESSAGE_H #include "msg/Message.h" #include "mon/Session.h" diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index d70da029ea7..a9eeeb72297 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -12,8 +12,8 @@ * */ -#ifndef __AUTHMONITOR_H -#define __AUTHMONITOR_H +#ifndef CEPH_AUTHMONITOR_H +#define CEPH_AUTHMONITOR_H #include <map> #include <set> diff --git a/src/mon/ClassMonitor.h b/src/mon/ClassMonitor.h index d8e86703f6b..3b4e3fd0cf1 100644 --- a/src/mon/ClassMonitor.h +++ b/src/mon/ClassMonitor.h @@ -12,8 +12,8 @@ * */ -#ifndef __CLASSMONITOR_H -#define __CLASSMONITOR_H +#ifndef CEPH_CLASSMONITOR_H +#define CEPH_CLASSMONITOR_H #include <map> #include <set> diff --git a/src/mon/Elector.h b/src/mon/Elector.h index 9bfd7cb644f..04e73c9ed27 100644 --- a/src/mon/Elector.h +++ b/src/mon/Elector.h @@ -13,8 +13,8 @@ */ -#ifndef __MON_ELECTOR_H -#define __MON_ELECTOR_H +#ifndef CEPH_MON_ELECTOR_H +#define CEPH_MON_ELECTOR_H #include <map> using namespace std; diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h index 9bd21b2b47d..91e0185b132 100644 --- a/src/mon/LogMonitor.h +++ b/src/mon/LogMonitor.h @@ -12,8 +12,8 @@ * */ -#ifndef __LOGMONITOR_H -#define __LOGMONITOR_H +#ifndef CEPH_LOGMONITOR_H +#define CEPH_LOGMONITOR_H #include <map> #include <set> diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index b833ac1730d..3bb6e724bc0 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -15,8 +15,8 @@ /* Metadata Server Monitor */ -#ifndef __MDSMONITOR_H -#define __MDSMONITOR_H +#ifndef CEPH_MDSMONITOR_H +#define CEPH_MDSMONITOR_H #include <map> #include <set> diff --git a/src/mon/MonCaps.h b/src/mon/MonCaps.h index 64ec34dd606..1fcb9321c26 100644 --- a/src/mon/MonCaps.h +++ b/src/mon/MonCaps.h @@ -25,8 +25,8 @@ * PAXOS_OSDMAP. */ -#ifndef __MONCAPS_H -#define __MONCAPS_H +#ifndef CEPH_MONCAPS_H +#define CEPH_MONCAPS_H #include "include/types.h" //#include "" diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index 4b4beb5744b..e9307abe21f 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_MONCLIENT_H -#define __CEPH_MONCLIENT_H +#ifndef CEPH_MONCLIENT_H +#define CEPH_MONCLIENT_H #include "msg/Dispatcher.h" #include "msg/Messenger.h" diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 8125a848fdc..eeb4b521aad 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -12,8 +12,8 @@ * */ -#ifndef __MONMAP_H -#define __MONMAP_H +#ifndef CEPH_MONMAP_H +#define CEPH_MONMAP_H #include "include/err.h" diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 829c506e346..27095ca3a82 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -20,8 +20,8 @@ * Placement Group (PG) Monitor, Metadata Server (MDS) Monitor, and Client Monitor. */ -#ifndef __MONITOR_H -#define __MONITOR_H +#ifndef CEPH_MONITOR_H +#define CEPH_MONITOR_H #include "include/types.h" #include "msg/Messenger.h" diff --git a/src/mon/MonitorStore.h b/src/mon/MonitorStore.h index a56aa6bc9b5..8025afaaa2c 100644 --- a/src/mon/MonitorStore.h +++ b/src/mon/MonitorStore.h @@ -12,8 +12,8 @@ * */ -#ifndef __MON_MONITORSTORE_H -#define __MON_MONITORSTORE_H +#ifndef CEPH_MON_MONITORSTORE_H +#define CEPH_MON_MONITORSTORE_H #include "include/types.h" #include "include/buffer.h" diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h index fbb7fa5d8b8..58f28441ccf 100644 --- a/src/mon/MonmapMonitor.h +++ b/src/mon/MonmapMonitor.h @@ -16,8 +16,8 @@ * The Monmap Monitor is used to track the monitors in the cluster. */ -#ifndef __MONMAPMONITOR_H -#define __MONMAPMONITOR_H +#ifndef CEPH_MONMAPMONITOR_H +#define CEPH_MONMAPMONITOR_H #include <map> #include <set> diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 0f1f4d914b0..b53f383dc86 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -15,8 +15,8 @@ /* Object Store Device (OSD) Monitor */ -#ifndef __OSDMONITOR_H -#define __OSDMONITOR_H +#ifndef CEPH_OSDMONITOR_H +#define CEPH_OSDMONITOR_H #include <map> #include <set> diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index ad00037e158..9cec907e366 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -18,8 +18,8 @@ * where & is a bit-wise AND and m=2^k-1 */ -#ifndef __PGMAP_H -#define __PGMAP_H +#ifndef CEPH_PGMAP_H +#define CEPH_PGMAP_H #include "osd/osd_types.h" #include <sstream> diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index 9e0584ee3c1..797c0273729 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -17,8 +17,8 @@ * that are replicated by the same set of devices. */ -#ifndef __PGMONITOR_H -#define __PGMONITOR_H +#ifndef CEPH_PGMONITOR_H +#define CEPH_PGMONITOR_H #include <map> #include <set> diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index c6eff222fb6..928b17647da 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -47,8 +47,8 @@ e 12v * See PaxosService.h */ -#ifndef __MON_PAXOS_H -#define __MON_PAXOS_H +#ifndef CEPH_MON_PAXOS_H +#define CEPH_MON_PAXOS_H #include "include/types.h" #include "mon_types.h" diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index e168e7790b3..18570a3327b 100644 --- a/src/mon/PaxosService.h +++ b/src/mon/PaxosService.h @@ -12,8 +12,8 @@ * */ -#ifndef __PAXOSSERVICE_H -#define __PAXOSSERVICE_H +#ifndef CEPH_PAXOSSERVICE_H +#define CEPH_PAXOSSERVICE_H #include "messages/PaxosServiceMessage.h" #include "include/Context.h" diff --git a/src/mon/Session.h b/src/mon/Session.h index 78e34e7c9b6..ba9c119fd1d 100644 --- a/src/mon/Session.h +++ b/src/mon/Session.h @@ -12,8 +12,8 @@ * */ -#ifndef __MON_SESSION_H -#define __MON_SESSION_H +#ifndef CEPH_MON_SESSION_H +#define CEPH_MON_SESSION_H #include "include/xlist.h" #include "msg/msg_types.h" diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h index dc8d2089395..24d0f1cd4bd 100644 --- a/src/mon/mon_types.h +++ b/src/mon/mon_types.h @@ -12,8 +12,8 @@ * */ -#ifndef __MON_TYPES_H -#define __MON_TYPES_H +#ifndef CEPH_MON_TYPES_H +#define CEPH_MON_TYPES_H #define PAXOS_PGMAP 0 // before osd, for pg kick to behave #define PAXOS_MDSMAP 1 diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h index d38745874b4..b995014dc46 100644 --- a/src/msg/Dispatcher.h +++ b/src/msg/Dispatcher.h @@ -13,8 +13,8 @@ */ -#ifndef __DISPATCHER_H -#define __DISPATCHER_H +#ifndef CEPH_DISPATCHER_H +#define CEPH_DISPATCHER_H #include "Message.h" #include "config.h" diff --git a/src/msg/FakeMessenger.h b/src/msg/FakeMessenger.h index cbe73d3a852..1c3f4895b25 100644 --- a/src/msg/FakeMessenger.h +++ b/src/msg/FakeMessenger.h @@ -14,8 +14,8 @@ -#ifndef __FAKEMESSENGER_H -#define __FAKEMESSENGER_H +#ifndef CEPH_FAKEMESSENGER_H +#define CEPH_FAKEMESSENGER_H #include "Messenger.h" #include "Dispatcher.h" diff --git a/src/msg/Message.h b/src/msg/Message.h index 44732aad2d0..5621a22c5ee 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -12,8 +12,8 @@ * */ -#ifndef __MESSAGE_H -#define __MESSAGE_H +#ifndef CEPH_MESSAGE_H +#define CEPH_MESSAGE_H /* public message types */ #include "include/types.h" diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index 930c9166b2b..1ced728805f 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -14,8 +14,8 @@ -#ifndef __MESSENGER_H -#define __MESSENGER_H +#ifndef CEPH_MESSENGER_H +#define CEPH_MESSENGER_H #include <map> using namespace std; diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index b02232e0f7c..a3a58f4a727 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -12,8 +12,8 @@ * */ -#ifndef __SIMPLEMESSENGER_H -#define __SIMPLEMESSENGER_H +#ifndef CEPH_SIMPLEMESSENGER_H +#define CEPH_SIMPLEMESSENGER_H #include "include/types.h" #include "include/xlist.h" diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index cf809cacc05..a3d41060fc9 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -12,8 +12,8 @@ * */ -#ifndef __MSG_TYPES_H -#define __MSG_TYPES_H +#ifndef CEPH_MSG_TYPES_H +#define CEPH_MSG_TYPES_H #include "include/types.h" #include "include/blobhash.h" diff --git a/src/msg/tcp.h b/src/msg/tcp.h index 2d77ad32d59..b66b9ec0dbc 100644 --- a/src/msg/tcp.h +++ b/src/msg/tcp.h @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __TCP_H -#define __TCP_H +#ifndef CEPH_TCP_H +#define CEPH_TCP_H #include <sys/socket.h> #include <netinet/in.h> diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h index 0af8906d9ea..700c4b8f27a 100644 --- a/src/objclass/objclass.h +++ b/src/objclass/objclass.h @@ -1,5 +1,5 @@ -#ifndef __OBJCLASS_H -#define __OBJCLASS_H +#ifndef CEPH_OBJCLASS_H +#define CEPH_OBJCLASS_H #ifdef __cplusplus diff --git a/src/os/BDBMap.h b/src/os/BDBMap.h index a8e96a8a192..74a26ee3ca4 100644 --- a/src/os/BDBMap.h +++ b/src/os/BDBMap.h @@ -13,8 +13,8 @@ */ -#ifndef __BERKELEYDB_H -#define __BERKELEYDB_H +#ifndef CEPH_BERKELEYDB_H +#define CEPH_BERKELEYDB_H #include <db.h> #include <unistd.h> diff --git a/src/os/Fake.h b/src/os/Fake.h index 4643c81942f..ee3ed01efcb 100644 --- a/src/os/Fake.h +++ b/src/os/Fake.h @@ -13,8 +13,8 @@ */ -#ifndef __FAKE_H -#define __FAKE_H +#ifndef CEPH_FAKE_H +#define CEPH_FAKE_H #include "include/types.h" diff --git a/src/os/FakeStoreBDBCollections.h b/src/os/FakeStoreBDBCollections.h index a779a2a5797..7d04e272d3f 100644 --- a/src/os/FakeStoreBDBCollections.h +++ b/src/os/FakeStoreBDBCollections.h @@ -13,8 +13,8 @@ */ -#ifndef __FAKESTOREBDBCOLLECTIONS_H -#define __FAKESTOREBDBCOLLECTIONS_H +#ifndef CEPH_FAKESTOREBDBCOLLECTIONS_H +#define CEPH_FAKESTOREBDBCOLLECTIONS_H #include "BDBMap.h" #include "ObjectStore.h" diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h index 8422cfcbff1..b177427d97c 100644 --- a/src/os/FileJournal.h +++ b/src/os/FileJournal.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_FILEJOURNAL_H -#define __EBOFS_FILEJOURNAL_H +#ifndef CEPH_EBOFS_FILEJOURNAL_H +#define CEPH_EBOFS_FILEJOURNAL_H #include <deque> using std::deque; diff --git a/src/os/FileStore.h b/src/os/FileStore.h index 5071ec29b17..404d57666c1 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -13,8 +13,8 @@ */ -#ifndef __FILESTORE_H -#define __FILESTORE_H +#ifndef CEPH_FILESTORE_H +#define CEPH_FILESTORE_H #include "ObjectStore.h" #include "JournalingObjectStore.h" diff --git a/src/os/Journal.h b/src/os/Journal.h index 67ef8863102..9876113451f 100644 --- a/src/os/Journal.h +++ b/src/os/Journal.h @@ -13,8 +13,8 @@ */ -#ifndef __EBOFS_JOURNAL_H -#define __EBOFS_JOURNAL_H +#ifndef CEPH_EBOFS_JOURNAL_H +#define CEPH_EBOFS_JOURNAL_H #include "include/buffer.h" #include "include/Context.h" diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h index 79a82c3716b..21ca375ad69 100644 --- a/src/os/JournalingObjectStore.h +++ b/src/os/JournalingObjectStore.h @@ -12,8 +12,8 @@ * */ -#ifndef __JOURNALINGOBJECTSTORE_H -#define __JOURNALINGOBJECTSTORE_H +#ifndef CEPH_JOURNALINGOBJECTSTORE_H +#define CEPH_JOURNALINGOBJECTSTORE_H #include "ObjectStore.h" #include "Journal.h" diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 787e79476d7..44aa05b5703 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -13,8 +13,8 @@ */ -#ifndef __OBJECTSTORE_H -#define __OBJECTSTORE_H +#ifndef CEPH_OBJECTSTORE_H +#define CEPH_OBJECTSTORE_H #include "include/types.h" #include "include/Context.h" diff --git a/src/os/btrfs_ioctl.h b/src/os/btrfs_ioctl.h index 424694aa517..0eb2c491272 100644 --- a/src/os/btrfs_ioctl.h +++ b/src/os/btrfs_ioctl.h @@ -16,8 +16,8 @@ * Boston, MA 021110-1307, USA. */ -#ifndef __IOCTL_ -#define __IOCTL_ +#ifndef BTRFS_IOCTL_H +#define BTRFS_IOCTL_H #include <linux/ioctl.h> #define BTRFS_IOCTL_MAGIC 0x94 diff --git a/src/osd/Ager.h b/src/osd/Ager.h index 60a4db0ea2a..fa98a9f3b69 100644 --- a/src/osd/Ager.h +++ b/src/osd/Ager.h @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __AGER_H -#define __AGER_H +#ifndef CEPH_AGER_H +#define CEPH_AGER_H #include "include/types.h" #include "include/Distribution.h" diff --git a/src/osd/OSD.h b/src/osd/OSD.h index b15478b4dd5..7465a9db409 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -12,8 +12,8 @@ * */ -#ifndef __OSD_H -#define __OSD_H +#ifndef CEPH_OSD_H +#define CEPH_OSD_H #include "msg/Dispatcher.h" diff --git a/src/osd/OSDCaps.h b/src/osd/OSDCaps.h index d84a4f34406..7201ba38a65 100644 --- a/src/osd/OSDCaps.h +++ b/src/osd/OSDCaps.h @@ -22,8 +22,8 @@ * should get * */ -#ifndef __CEPH_OSDCAPS_H -#define __CEPH_OSDCAPS_H +#ifndef CEPH_OSDCAPS_H +#define CEPH_OSDCAPS_H #include "include/types.h" diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 53936c315bb..1ca3f6883b9 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -13,8 +13,8 @@ */ -#ifndef __OSDMAP_H -#define __OSDMAP_H +#ifndef CEPH_OSDMAP_H +#define CEPH_OSDMAP_H /* * describe properties of the OSD cluster. diff --git a/src/osd/ObjectVersioner.h b/src/osd/ObjectVersioner.h index 29dd1d18d06..f7d7563302f 100644 --- a/src/osd/ObjectVersioner.h +++ b/src/osd/ObjectVersioner.h @@ -12,8 +12,8 @@ * */ -#ifndef __CEPH_OSD_OBJECTVERSIONER_H -#define __CEPH_OSD_OBJECTVERSIONER_H +#ifndef CEPH_OSD_OBJECTVERSIONER_H +#define CEPH_OSD_OBJECTVERSIONER_H class ObjectVersioner { public: diff --git a/src/osd/PG.h b/src/osd/PG.h index 20c0f919c06..d4e4504183a 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -12,8 +12,8 @@ * */ -#ifndef __PG_H -#define __PG_H +#ifndef CEPH_PG_H +#define CEPH_PG_H #include "include/types.h" diff --git a/src/osd/PGLS.h b/src/osd/PGLS.h index c5b9ca99ad2..7c491729a65 100644 --- a/src/osd/PGLS.h +++ b/src/osd/PGLS.h @@ -1,5 +1,5 @@ -#ifndef __PGLS_H -#define __PGLS_H +#ifndef CEPH_PGLS_H +#define CEPH_PGLS_H #include "include/types.h" diff --git a/src/osd/RAID4PG.h b/src/osd/RAID4PG.h index 608b95133c5..0a071786f00 100644 --- a/src/osd/RAID4PG.h +++ b/src/osd/RAID4PG.h @@ -11,8 +11,8 @@ * */ -#ifndef __RAID4PG_H -#define __RAID4PG_H +#ifndef CEPH_RAID4PG_H +#define CEPH_RAID4PG_H #include "PG.h" diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index d5e1b21ead7..c2d0855d9ff 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -11,8 +11,8 @@ * */ -#ifndef __REPLICATEDPG_H -#define __REPLICATEDPG_H +#ifndef CEPH_REPLICATEDPG_H +#define CEPH_REPLICATEDPG_H #include "PG.h" diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 80a6e517024..874b5bcbdab 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -12,8 +12,8 @@ * */ -#ifndef __OSD_TYPES_H -#define __OSD_TYPES_H +#ifndef CEPH_OSD_TYPES_H +#define CEPH_OSD_TYPES_H #include <stdio.h> diff --git a/src/osdc/Blinker.h b/src/osdc/Blinker.h index e59c9629725..48526c69b7a 100644 --- a/src/osdc/Blinker.h +++ b/src/osdc/Blinker.h @@ -12,8 +12,8 @@ * */ -#ifndef __BLINKER_H -#define __BLINKER_H +#ifndef CEPH_BLINKER_H +#define CEPH_BLINKER_H class Blinker { diff --git a/src/osdc/Filer.h b/src/osdc/Filer.h index 73e43028a48..a06c99c6d6b 100644 --- a/src/osdc/Filer.h +++ b/src/osdc/Filer.h @@ -13,8 +13,8 @@ */ -#ifndef __FILER_H -#define __FILER_H +#ifndef CEPH_FILER_H +#define CEPH_FILER_H /*** Filer * diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index 91a21cc274e..f329b0624e4 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -47,8 +47,8 @@ * */ -#ifndef __JOURNALER_H -#define __JOURNALER_H +#ifndef CEPH_JOURNALER_H +#define CEPH_JOURNALER_H #include "Objecter.h" #include "Filer.h" diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index 79fbdff0a7f..7725b8c4a1b 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef __OBJECTCACHER_H -#define __OBJECTCACHER_H +#ifndef CEPH_OBJECTCACHER_H +#define CEPH_OBJECTCACHER_H #include "include/types.h" #include "include/lru.h" diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 263c7f5ce30..4686c2f8c14 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -12,8 +12,8 @@ * */ -#ifndef __OBJECTER_H -#define __OBJECTER_H +#ifndef CEPH_OBJECTER_H +#define CEPH_OBJECTER_H #include "include/types.h" #include "include/buffer.h" diff --git a/src/rgw/rgw_access.h b/src/rgw/rgw_access.h index aedbdb0b10b..210d86f861f 100644 --- a/src/rgw/rgw_access.h +++ b/src/rgw/rgw_access.h @@ -1,5 +1,5 @@ -#ifndef __RGW_ACCESS_H -#define __RGW_ACCESS_H +#ifndef CEPH_RGW_ACCESS_H +#define CEPH_RGW_ACCESS_H #include <time.h> #include <string> diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h index 888c6da937e..a4bae9357f5 100644 --- a/src/rgw/rgw_acl.h +++ b/src/rgw/rgw_acl.h @@ -1,5 +1,5 @@ -#ifndef __RGW_ACL_H -#define __RGW_ACL_H +#ifndef CEPH_RGW_ACL_H +#define CEPH_RGW_ACL_H #include <map> #include <string> diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 676bc8958ad..90601f8f627 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -12,8 +12,8 @@ * */ -#ifndef __RGW_COMMON_H -#define __RGW_COMMON_H +#ifndef CEPH_RGW_COMMON_H +#define CEPH_RGW_COMMON_H #include "fcgiapp.h" diff --git a/src/rgw/rgw_fs.h b/src/rgw/rgw_fs.h index 87bac4043af..702fae24705 100644 --- a/src/rgw/rgw_fs.h +++ b/src/rgw/rgw_fs.h @@ -1,5 +1,5 @@ -#ifndef __RGW_FS_H -#define __RGW_FS_H +#ifndef CEPH_RGW_FS_H +#define CEPH_RGW_FS_H #include "rgw_access.h" diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index 64a9283f961..36ea6d552a8 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -6,8 +6,8 @@ * These subclasses must be further subclassed (by interface type) * to provide additional virtual methods such as send_response or get_params. */ -#ifndef __RGW_OP_H -#define __RGW_OP_H +#ifndef CEPH_RGW_OP_H +#define CEPH_RGW_OP_H #include <string> diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 4c8f7b3a769..27552177772 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -1,5 +1,5 @@ -#ifndef __RGWRADOS_H -#define __RGWRADOS_H +#ifndef CEPH_RGWRADOS_H +#define CEPH_RGWRADOS_H #include "include/librados.h" #include "rgw_access.h" diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index 45fd1b1481a..6f0b167af36 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -1,5 +1,5 @@ -#ifndef __RGW_REST_H -#define __RGW_REST_H +#ifndef CEPH_RGW_REST_H +#define CEPH_RGW_REST_H #include "rgw_op.h" diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h index 98ce1bdac2e..1fc4ec3f245 100644 --- a/src/rgw/rgw_user.h +++ b/src/rgw/rgw_user.h @@ -1,5 +1,5 @@ -#ifndef __RGW_USER_H -#define __RGW_USER_H +#ifndef CEPH_RGW_USER_H +#define CEPH_RGW_USER_H #include <string> diff --git a/wireshark/ceph/ceph_fs.h b/wireshark/ceph/ceph_fs.h index 0fab7732ebf..41a941c7ac1 100644 --- a/wireshark/ceph/ceph_fs.h +++ b/wireshark/ceph/ceph_fs.h @@ -9,8 +9,8 @@ * LGPL2 */ -#ifndef _FS_CEPH_CEPH_FS_H -#define _FS_CEPH_CEPH_FS_H +#ifndef CEPH_FS_H +#define CEPH_FS_H #include "msgr.h" #include "rados.h" diff --git a/wireshark/ceph/crc32c.h b/wireshark/ceph/crc32c.h index 6c66e49c2ad..13df359d7ad 100644 --- a/wireshark/ceph/crc32c.h +++ b/wireshark/ceph/crc32c.h @@ -1,5 +1,5 @@ -#ifndef __CEPH_CRC32C -#define __CEPH_CRC32C +#ifndef CEPH_CRC32C_H +#define CEPH_CRC32C_H #ifdef __cplusplus extern "C" { diff --git a/wireshark/ceph/msgr.h b/wireshark/ceph/msgr.h index f1d10417471..2f617040475 100644 --- a/wireshark/ceph/msgr.h +++ b/wireshark/ceph/msgr.h @@ -1,5 +1,5 @@ -#ifndef __MSGR_H -#define __MSGR_H +#ifndef CEPH_MSGR_H +#define CEPH_MSGR_H /* * Data types for message passing layer used by Ceph. diff --git a/wireshark/ceph/rados.h b/wireshark/ceph/rados.h index a48cf4ae391..2b7833cadda 100644 --- a/wireshark/ceph/rados.h +++ b/wireshark/ceph/rados.h @@ -1,5 +1,5 @@ -#ifndef __RADOS_H -#define __RADOS_H +#ifndef CEPH_RADOS_H +#define CEPH_RADOS_H /* * Data types for the Ceph distributed object storage layer RADOS diff --git a/wireshark/ceph/types.h b/wireshark/ceph/types.h index 540286977ef..1bcc48dc577 100644 --- a/wireshark/ceph/types.h +++ b/wireshark/ceph/types.h @@ -1,5 +1,5 @@ -#ifndef _WS_CEPH_TYPES_H -#define _WS_CEPH_TYPES_H +#ifndef CEPH_WS_TYPES_H +#define CEPH_WS_TYPES_H #ifdef HAVE_CONFIG_H # include "config.h" |