Bug ceph#98: Unique names for include guards

A couple of preprocessor symbols for include guards tampered with the reserved namespace. Signed-off-by: Markus Elfring <[email protected]> Signed-off-by: Sage Weil <[email protected]>
jjzhang · Jun 17, 2010 · f4b9d9d · f4b9d9d
1 parent 6de2dde
commit f4b9d9d
Show file tree

Hide file tree

Showing 310 changed files with 620 additions and 620 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"