summaryrefslogtreecommitdiff
path: root/wireshark
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2010-06-12 15:04:11 +0200
committerSage Weil <sage@newdream.net>2010-06-17 10:47:37 -0700
commitf4b9d9d847627e2445cd8bd80c6b893cd9efcd30 (patch)
treef8c0684d6c57a8025cafc1836cfd29f7ff416b01 /wireshark
parent6de2dde76253e56ef2dc7aa03ee709a519576dcb (diff)
downloadceph-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>
Diffstat (limited to 'wireshark')
-rw-r--r--wireshark/ceph/ceph_fs.h4
-rw-r--r--wireshark/ceph/crc32c.h4
-rw-r--r--wireshark/ceph/msgr.h4
-rw-r--r--wireshark/ceph/rados.h4
-rw-r--r--wireshark/ceph/types.h4
5 files changed, 10 insertions, 10 deletions
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"