Fixes for bug #12

9 files changed, 18 insertions, 18 deletions

diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h
index 2ed6c9fff..1b370aa0b 100644
--- a/src/modules/m_spanningtree/cachetimer.h
+++ b/src/modules/m_spanningtree/cachetimer.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __TIMESYNC_H__
-#define __TIMESYNC_H__
+#ifndef TIMESYNC_H
+#define TIMESYNC_H
 
 #include "timer.h"
 
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 09591b4e4..0a0193c2f 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __COMMANDS_H__
-#define __COMMANDS_H__
+#ifndef COMMANDS_H
+#define COMMANDS_H
 
 #include "main.h"
 
diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h
index c60cb0bb7..1ca73c69d 100644
--- a/src/modules/m_spanningtree/link.h
+++ b/src/modules/m_spanningtree/link.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __LINK_H__
-#define __LINK_H__
+#ifndef LINK_H
+#define LINK_H
 
 class Link : public refcountbase
 {
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index ce7709189..44abd452f 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __ST_MAIN__
-#define __ST_MAIN__
+#ifndef ST_MAIN
+#define ST_MAIN
 
 #include "inspircd.h"
 #include <stdarg.h>
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index 762946901..ed421ad6e 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -1,5 +1,5 @@
-#ifndef _SPANNINGTREE_PROTOCOL_INT_
-#define _SPANNINGTREE_PROTOCOL_INT_
+#ifndef SPANNINGTREE_PROTOCOL_INT
+#define SPANNINGTREE_PROTOCOL_INT
 
 class SpanningTreeUtilities;
 class ModuleSpanningTree;
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 348debe47..f69a9bc3c 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __RESOLVERS__H__
-#define __RESOLVERS__H__
+#ifndef RESOLVERS_H
+#define RESOLVERS_H
 
 #include "socket.h"
 #include "inspircd.h"
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 7eb19d9a1..e7fbac619 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __TREESERVER_H__
-#define __TREESERVER_H__
+#ifndef TREESERVER_H
+#define TREESERVER_H
 
 #include "treesocket.h"
 
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 2ad4d68af..00a730622 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __TREESOCKET_H__
-#define __TREESOCKET_H__
+#ifndef TREESOCKET_H
+#define TREESOCKET_H
 
 #include "socket.h"
 #include "inspircd.h"
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 2e527ae12..36fec43ef 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __ST__UTIL__
-#define __ST__UTIL__
+#ifndef ST__UTIL
+#define ST__UTIL
 
 #include "inspircd.h"