From 6ae47faebb4a5994e6c263eb852cc4381528dfd2 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 30 Oct 2009 10:09:35 -0700
Subject: [PATCH] include guards cleanup

---
 src/crush/grammar.h     | 4 ++--
 src/include/LogEntry.h  | 4 ++--
 src/include/crc32c.h    | 4 ++--
 src/include/cstring.h   | 4 ++--
 src/messages/MOSDMap.h  | 4 ++--
 src/osdc/ObjectCacher.h | 4 ++--
 src/rgw/rgw_access.h    | 4 ++--
 src/rgw/rgw_common.h    | 4 ++--
 src/rgw/rgw_fs.h        | 4 ++--
 src/rgw/rgw_op.h        | 4 ++--
 src/rgw/rgw_rest.h      | 4 ++--
 src/rgw/rgw_user.h      | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/crush/grammar.h b/src/crush/grammar.h
index a9b7407c99b9f..4228627604683 100644
--- a/src/crush/grammar.h
+++ b/src/crush/grammar.h
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef __CRUSH_GRAMMAR
-#define __CRUSH_GRAMMAR
+#ifndef __CRUSH_GRAMMAR_H
+#define __CRUSH_GRAMMAR_H
 
 //#define BOOST_SPIRIT_DEBUG
 
diff --git a/src/include/LogEntry.h b/src/include/LogEntry.h
index 3d3ca2cb76131..740e7e4383176 100644
--- a/src/include/LogEntry.h
+++ b/src/include/LogEntry.h
@@ -12,8 +12,8 @@
  * 
  */
 
-#ifndef __CEPH_LOG_H
-#define __CEPH_LOG_H
+#ifndef __CEPH_LOGENTRY_H
+#define __CEPH_LOGENTRY_H
 
 #include "include/types.h"
 #include "include/encoding.h"
diff --git a/src/include/crc32c.h b/src/include/crc32c.h
index 6c66e49c2ad3a..c0efcb9e2ccc7 100644
--- a/src/include/crc32c.h
+++ b/src/include/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/src/include/cstring.h b/src/include/cstring.h
index 8d54f73f550d9..9f00cc38309ae 100644
--- a/src/include/cstring.h
+++ b/src/include/cstring.h
@@ -1,5 +1,5 @@
-#ifndef _CEPH_CSTRING
-#define _CEPH_CSTRING
+#ifndef _CEPH_CSTRING_H
+#define _CEPH_CSTRING_H
 
 /*
  * cstring - a simple string class
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 677f8032e9ba2..cfb1750c410af 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -13,8 +13,8 @@
  */
 
 
-#ifndef __MOSDGETMAPACK_H
-#define __MOSDGETMAPACK_H
+#ifndef __MOSDMAP_H
+#define __MOSDMAP_H
 
 #include "msg/Message.h"
 #include "osd/OSDMap.h"
diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index 19422c3e33f77..9ab97e03d4654 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 __OBJECTCACHER_H
+#define __OBJECTCACHER_H
 
 #include "include/types.h"
 #include "include/lru.h"
diff --git a/src/rgw/rgw_access.h b/src/rgw/rgw_access.h
index 9fe0c5bf750ca..75daeb8af9e72 100644
--- a/src/rgw/rgw_access.h
+++ b/src/rgw/rgw_access.h
@@ -1,5 +1,5 @@
-#ifndef __RGWACCESS_H
-#define __RGWACCESS_H
+#ifndef __RGW_ACCESS_H
+#define __RGW_ACCESS_H
 
 #include <time.h>
 #include <string>
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index deca3606b6999..9f6c16765988a 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1,5 +1,5 @@
-#ifndef __RGWCOMMON_H
-#define __RGWCOMMON_H
+#ifndef __RGW_COMMON_H
+#define __RGW_COMMON_H
 
 #include "fcgiapp.h"
 
diff --git a/src/rgw/rgw_fs.h b/src/rgw/rgw_fs.h
index 3ecf845b17984..d8aff28e3a859 100644
--- a/src/rgw/rgw_fs.h
+++ b/src/rgw/rgw_fs.h
@@ -1,5 +1,5 @@
-#ifndef __RGWFS_H
-#define __RGWFS_H
+#ifndef __RGW_FS_H
+#define __RGW_FS_H
 
 #include "rgw_access.h"
 
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 949304cf68d23..88d75d8d855ab 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1,5 +1,5 @@
-#ifndef __RGWOP_H
-#define __RGWOP_H
+#ifndef __RGW_OP_H
+#define __RGW_OP_H
 
 #include <string>
 
diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 5a677b16c6231..45fd1b1481a12 100644
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -1,5 +1,5 @@
-#ifndef __RGWREST_H
-#define __RGWREST_H
+#ifndef __RGW_REST_H
+#define __RGW_REST_H
 
 #include "rgw_op.h"
 
diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index 241d476d77b0d..25eb8e8c67838 100644
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -1,5 +1,5 @@
-#ifndef __USER_H
-#define __USER_H
+#ifndef __RGW_USER_H
+#define __RGW_USER_H
 
 #include <string>
 
-- 
2.39.5