Fix some of the include guard names (requested by SaberUK)

diff --git a/include/cull_list.h b/include/cull_list.h
index a9e99385a312c508f9c1a95f00ed7533c35e287b..8e2d5f2abbf2ed6c2717239861b419c8db6a6629 100644 (file)
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef CULLLIST_H
-#define CULLLIST_H
+#ifndef CULL_LIST_H
+#define CULL_LIST_H
 
 /**
  * The CullList class is used to delete objects at the end of the main loop to

diff --git a/include/filelogger.h b/include/filelogger.h
index 6612a559b34d1eed62f0d90b3bb51cddcce331af..45c96bc9f25ea8c65e4afa4b3b89d8229d952454 100644 (file)
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef LOG_H
-#define LOG_H
+#ifndef FILELOGGER_H
+#define FILELOGGER_H
 
 #include "logger.h"
 

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 07beb59c61ea3cfb2e33ca8cad5a0b903d051741..71c2a06d92adec37bc138d268299de2b438511d5 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef INSP_SOCKET_H
-#define INSP_SOCKET_H
+#ifndef INSPSOCKET_H
+#define INSPSOCKET_H
 
 #include "timer.h"
 

diff --git a/include/inspstring.h b/include/inspstring.h
index 20b16202ed897980ce53a3cf19e7c579492f2712..da376624102d11ed32c43feea208fcded5038192 100644 (file)
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef IN_INSPSTRING_H
-#define IN_INSPSTRING_H
+#ifndef INSPSTRING_H
+#define INSPSTRING_H
 
 // This (inspircd_config) is needed as inspstring doesn't pull in the central header
 #include "inspircd_config.h"

diff --git a/include/logger.h b/include/logger.h
index 6168bedefdf1513cecdef27c4f5b5b200c1035f2..f6f2f1e4fabcc7624fc593dc3b6471a42e1bf44b 100644 (file)
--- a/include/logger.h
+++ b/include/logger.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef LOGMANAGER_H
-#define LOGMANAGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
 
 /** This class implements a nonblocking writer.
  * Most people writing an ircd give little thought to their disk

diff --git a/include/socketengine.h b/include/socketengine.h
index 0386ebd1d13f689f679b19876d5ce7e2d774d743..9b7ccbf1f878f49bf340fc0f9623eca7c0fbda3a 100644 (file)
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef SOCKETENGINE
-#define SOCKETENGINE
+#ifndef SOCKETENGINE_H
+#define SOCKETENGINE_H
 
 #include <vector>
 #include <string>

diff --git a/include/threadengine.h b/include/threadengine.h
index c73dd19bf0fef2865ec24fb43755009fb212ee94..3768f113cade7e544205d1b3d4326e2173ac2b1a 100644 (file)
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef THREADENGINE
-#define THREADENGINE
+#ifndef THREADENGINE_H
+#define THREADENGINE_H
 
 #include <vector>
 #include <string>

diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index d5c7696af4801d1937e3fb604896cbc625c4843d..4a8ab241e4bc41cc81cd59e223e72baabd1145f9 100644 (file)
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef THREADENGINE_PTHREAD
-#define THREADENGINE_PTHREAD
+#ifndef THREADENGINE_PTHREAD_H
+#define THREADENGINE_PTHREAD_H
 
 #include <pthread.h>
 #include "typedefs.h"

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 23d3e9233abcb34492e296d53934d92b346219ba..b6025d3361005c5957b44f99f2c5a68cf00206f6 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef THREADENGINE_WIN32THREAD
-#define THREADENGINE_WIN32THREAD
+#ifndef THREADENGINE_WIN32_H
+#define THREADENGINE_WIN32_H
 
 #include "inspircd_config.h"
 #include "base.h"

diff --git a/include/typedefs.h b/include/typedefs.h
index 76fb929ca706290f31f4e26da2c9969eb5b7b7a6..ba811e7140b00b85314f833c34b655f536309ed7 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef TYPEDEF_H
-#define TYPEDEF_H
+#ifndef TYPEDEFS_H
+#define TYPEDEFS_H
 
 class BanCacheManager;
 class BanItem;

diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index d37b509328c1bf61df8dce9820df937683310185..919075a0aabbf9487f105149b5d5d64a62093c09 100644 (file)
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef CAP_H
-#define CAP_H
+#ifndef M_CAP_H
+#define M_CAP_H
 
 #include <map>
 #include <string>

diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h
index 1b370aa0b2ff91160191239de003e11e04514ddd..7b68f5779d74c486cfbf0bd6181fc0911f5defbd 100644 (file)
--- 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 M_SPANNINGTREE_CACHETIMER_H
+#define M_SPANNINGTREE_CACHETIMER_H
 
 #include "timer.h"
 

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 0a0193c2f359fd83b85f6eb84703e75fd16bbd99..358acaa293327cd23e554d1d02759b1b964fca76 100644 (file)
--- 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 M_SPANNINGTREE_COMMANDS_H
+#define M_SPANNINGTREE_COMMANDS_H
 
 #include "main.h"
 

diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h
index 1ca73c69d319abac57c41f941b685d81957153db..9423891676d00c3ed5aadf9fa3308f98fef066ea 100644 (file)
--- 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 M_SPANNINGTREE_LINK_H
+#define M_SPANNINGTREE_LINK_H
 
 class Link : public refcountbase
 {

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 44abd452f31c2c655125881cfe25740a82c0695f..735c31049f90f5ca6393c65cb2e19138647c8263 100644 (file)
--- 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 M_SPANNINGTREE_MAIN_H
+#define M_SPANNINGTREE_MAIN_H
 
 #include "inspircd.h"
 #include <stdarg.h>

diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index ed421ad6e4ef3b7f91805377b4c60f41846e4673..7559897bd4daf83cbdc9ff755a5ac5496874ef17 100644 (file)
--- 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 M_SPANNINGTREE_PROTOCOLINTERFACE_H
+#define M_SPANNINGTREE_PROTOCOLINTERFACE_H
 
 class SpanningTreeUtilities;
 class ModuleSpanningTree;

diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index f69a9bc3c4eb3098f21d123ff6dc75bc9a195d60..af22331f11ca95ae555e5d5c6fd9e655fba04ddf 100644 (file)
--- 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 M_SPANNINGTREE_RESOLVERS_H
+#define M_SPANNINGTREE_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 e7fbac619c9ec3fba3386e68fe2e66ebcb3ab5ab..65d095c5af9e03a809ed52b20f19b470a67f1cc6 100644 (file)
--- 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 M_SPANNINGTREE_TREESERVER_H
+#define M_SPANNINGTREE_TREESERVER_H
 
 #include "treesocket.h"
 

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 00a7306222a14cee1fc957a4b61172fc7b6b5cde..80f9e0798e1c2895e5b9063950e9d8344ea94490 100644 (file)
--- 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 M_SPANNINGTREE_TREESOCKET_H
+#define M_SPANNINGTREE_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 36fec43efec46192318b062baaca46e359498ba0..2543eb04f4a2b3ad314fe7b004a4aa164b92e32d 100644 (file)
--- 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 M_SPANNINGTREE_UTILS_H
+#define M_SPANNINGTREE_UTILS_H
 
 #include "inspircd.h"