Fixes for bug #12

29 files changed, 58 insertions, 58 deletions

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index e3bfbe55e..aafabba28 100644
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_AWAY_H__
-#define __CMD_AWAY_H__
+#ifndef CMD_AWAY_H
+#define CMD_AWAY_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 4b1e3e9be..bac56807e 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_COMMANDS_H__
-#define __CMD_COMMANDS_H__
+#ifndef CMD_COMMANDS_H
+#define CMD_COMMANDS_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 537d39208..6c8586c01 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -26,8 +26,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __CMD_ELINE_H__
-#define __CMD_ELINE_H__
+#ifndef CMD_ELINE_H
+#define CMD_ELINE_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_ison.cpp b/src/commands/cmd_ison.cpp
index f964c7442..a26cfed55 100644
--- a/src/commands/cmd_ison.cpp
+++ b/src/commands/cmd_ison.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_ISON_H__
-#define __CMD_ISON_H__
+#ifndef CMD_ISON_H
+#define CMD_ISON_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp
index 17a71688a..e473053e5 100644
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_JOIN_H__
-#define __CMD_JOIN_H__
+#ifndef CMD_JOIN_H
+#define CMD_JOIN_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_links.cpp b/src/commands/cmd_links.cpp
index 951c798ea..e48d452cd 100644
--- a/src/commands/cmd_links.cpp
+++ b/src/commands/cmd_links.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_LINKS_H__
-#define __CMD_LINKS_H__
+#ifndef CMD_LINKS_H
+#define CMD_LINKS_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
index 4a2f4f7df..ca970bbb6 100644
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_LUSERS_H__
-#define __CMD_LUSERS_H__
+#ifndef CMD_LUSERS_H
+#define CMD_LUSERS_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_names.cpp b/src/commands/cmd_names.cpp
index 8fbccb77f..6238bff87 100644
--- a/src/commands/cmd_names.cpp
+++ b/src/commands/cmd_names.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_NAMES_H__
-#define __CMD_NAMES_H__
+#ifndef CMD_NAMES_H
+#define CMD_NAMES_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 126b49ee4..5b00524d7 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_USERHOST_H__
-#define __CMD_USERHOST_H__
+#ifndef CMD_USERHOST_H
+#define CMD_USERHOST_H
 
 // include the common header files
 
diff --git a/src/commands/cmd_version.cpp b/src/commands/cmd_version.cpp
index 3064c9440..eacce31bb 100644
--- a/src/commands/cmd_version.cpp
+++ b/src/commands/cmd_version.cpp
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_VERSION_H__
-#define __CMD_VERSION_H__
+#ifndef CMD_VERSION_H
+#define CMD_VERSION_H
 
 // include the common header files
 
diff --git a/src/modules/account.h b/src/modules/account.h
index 8f4631cc8..77f84ec4d 100644
--- a/src/modules/account.h
+++ b/src/modules/account.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __ACCOUNT_H__
-#define __ACCOUNT_H__
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
 
 #include <map>
 #include <string>
diff --git a/src/modules/hash.h b/src/modules/hash.h
index 7e93f0ddc..c2b8abfd1 100644
--- a/src/modules/hash.h
+++ b/src/modules/hash.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __HASH_H__
-#define __HASH_H__
+#ifndef HASH_H
+#define HASH_H
 
 #include "modules.h"
 
diff --git a/src/modules/httpd.h b/src/modules/httpd.h
index 40e619ea3..18876be20 100644
--- a/src/modules/httpd.h
+++ b/src/modules/httpd.h
@@ -13,8 +13,8 @@
 
 #include "base.h"
 
-#ifndef __HTTPD_H__
-#define __HTTPD_H__
+#ifndef HTTPD_H
+#define HTTPD_H
 
 #include <string>
 #include <sstream>
diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index d2d094c85..d37b50932 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __CAP_H__
-#define __CAP_H__
+#ifndef CAP_H
+#define CAP_H
 
 #include <map>
 #include <string>
diff --git a/src/modules/m_regex.h b/src/modules/m_regex.h
index 523f9f0d3..fc196fac1 100644
--- a/src/modules/m_regex.h
+++ b/src/modules/m_regex.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef _M_REGEX_H
-#define _M_REGEX_H
+#ifndef M_REGEX_H
+#define M_REGEX_H
 
 #include "inspircd.h"
 
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"
 
diff --git a/src/modules/sasl.h b/src/modules/sasl.h
index 9abfc558a..927a4fb02 100644
--- a/src/modules/sasl.h
+++ b/src/modules/sasl.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __SASL_H__
-#define __SASL_H__
+#ifndef SASL_H
+#define SASL_H
 
 class SASLFallback : public Event
 {
diff --git a/src/modules/spanningtree.h b/src/modules/spanningtree.h
index ec3c36214..8a38d5588 100644
--- a/src/modules/spanningtree.h
+++ b/src/modules/spanningtree.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __SPANNINGTREE_H__
-#define __SPANNINGTREE_H__
+#ifndef SPANNINGTREE_H
+#define SPANNINGTREE_H
 
 struct AddServerEvent : public Event
 {
diff --git a/src/modules/ssl.h b/src/modules/ssl.h
index e66e423aa..060c64a0e 100644
--- a/src/modules/ssl.h
+++ b/src/modules/ssl.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __SSL_H__
-#define __SSL_H__
+#ifndef SSL_H
+#define SSL_H
 
 #include <map>
 #include <string>
diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index d20ac35a2..b84cbc5de 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -14,8 +14,8 @@
 #include "inspircd.h"
 #include "exitcodes.h"
 
-#ifndef __SOCKETENGINE_POLL__
-#define __SOCKETENGINE_POLL__
+#ifndef SOCKETENGINE_POLL
+#define SOCKETENGINE_POLL
 
 #include <vector>
 #include <string>
diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index 258c89709..8a14c358b 100644
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -15,8 +15,8 @@
 #include "exitcodes.h"
 #include <port.h>
 
-#ifndef __SOCKETENGINE_PORTS__
-#define __SOCKETENGINE_PORTS__
+#ifndef SOCKETENGINE_PORTS
+#define SOCKETENGINE_PORTS
 
 #ifndef __sun
 # error You need Solaris 10 or later to make use of this code.