From 9ebd9cba72056c5b36696e166826afb981f25ebb Mon Sep 17 00:00:00 2001 From: Justin Crawford Date: Sat, 14 Apr 2012 20:21:38 -0700 Subject: [PATCH] Fix some of the include guard names (requested by SaberUK) --- include/cull_list.h | 4 ++-- include/filelogger.h | 4 ++-- include/inspsocket.h | 4 ++-- include/inspstring.h | 4 ++-- include/logger.h | 4 ++-- include/socketengine.h | 4 ++-- include/threadengine.h | 4 ++-- include/threadengines/threadengine_pthread.h | 4 ++-- include/threadengines/threadengine_win32.h | 4 ++-- include/typedefs.h | 4 ++-- src/modules/m_cap.h | 4 ++-- src/modules/m_spanningtree/cachetimer.h | 4 ++-- src/modules/m_spanningtree/commands.h | 4 ++-- src/modules/m_spanningtree/link.h | 4 ++-- src/modules/m_spanningtree/main.h | 4 ++-- src/modules/m_spanningtree/protocolinterface.h | 4 ++-- src/modules/m_spanningtree/resolvers.h | 4 ++-- src/modules/m_spanningtree/treeserver.h | 4 ++-- src/modules/m_spanningtree/treesocket.h | 4 ++-- src/modules/m_spanningtree/utils.h | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/include/cull_list.h b/include/cull_list.h index a9e99385a..8e2d5f2ab 100644 --- 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 6612a559b..45c96bc9f 100644 --- 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 07beb59c6..71c2a06d9 100644 --- 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 20b16202e..da3766241 100644 --- 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 6168bedef..f6f2f1e4f 100644 --- 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 0386ebd1d..9b7ccbf1f 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef SOCKETENGINE -#define SOCKETENGINE +#ifndef SOCKETENGINE_H +#define SOCKETENGINE_H #include #include diff --git a/include/threadengine.h b/include/threadengine.h index c73dd19bf..3768f113c 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef THREADENGINE -#define THREADENGINE +#ifndef THREADENGINE_H +#define THREADENGINE_H #include #include diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index d5c7696af..4a8ab241e 100644 --- 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 #include "typedefs.h" diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index 23d3e9233..b6025d336 100644 --- 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 76fb929ca..ba811e714 100644 --- 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 d37b50932..919075a0a 100644 --- 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 #include diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h index 1b370aa0b..7b68f5779 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 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 0a0193c2f..358acaa29 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 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 1ca73c69d..942389167 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 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 44abd452f..735c31049 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 M_SPANNINGTREE_MAIN_H +#define M_SPANNINGTREE_MAIN_H #include "inspircd.h" #include diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index ed421ad6e..7559897bd 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 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 f69a9bc3c..af22331f1 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 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 e7fbac619..65d095c5a 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 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 00a730622..80f9e0798 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 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 36fec43ef..2543eb04f 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 M_SPANNINGTREE_UTILS_H +#define M_SPANNINGTREE_UTILS_H #include "inspircd.h" -- 2.39.2