From a5d55145049d2a067376ded46901f3a1a4b3273a Mon Sep 17 00:00:00 2001 From: Justin Crawford Date: Sat, 14 Apr 2012 19:50:31 -0700 Subject: Fixes for issue #12 --- src/modules/account.h | 4 ++-- src/modules/hash.h | 4 ++-- src/modules/httpd.h | 4 ++-- src/modules/m_cap.h | 4 ++-- src/modules/m_regex.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 ++-- src/modules/opflags.h | 4 ++-- src/modules/sasl.h | 4 ++-- src/modules/spanningtree.h | 4 ++-- src/modules/ssl.h | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/modules') diff --git a/src/modules/account.h b/src/modules/account.h index b35c40948..352bebc9f 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 class AccountEvent : public Event { diff --git a/src/modules/hash.h b/src/modules/hash.h index 7cad0f6fd..374fc50b4 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 cb6ed1c1c..26ba713e1 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 #include diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h index 1ee7902e5..9b8decc7d 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 #include diff --git a/src/modules/m_regex.h b/src/modules/m_regex.h index 4982c377b..aad66048d 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 f8eea6660..5c86c415a 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 076cd9198..d4f3f7d42 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 59923b8e2..99fb96781 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 b9d5ac1d8..16d671b8b 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 diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index a155b4db9..d339f850e 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 dc5c4446c..98fb4ba78 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 9a484cf94..5e6a41d92 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 2fe4b07f1..6e68d7601 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 c4b3114d4..64fe9b563 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" #include "cull_list.h" diff --git a/src/modules/opflags.h b/src/modules/opflags.h index 7ee79e86f..5ceb94e84 100644 --- a/src/modules/opflags.h +++ b/src/modules/opflags.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __OPFLAGS_H__ -#define __OPFLAGS_H__ +#ifndef OPFLAGS_H +#define OPFLAGS_H class OpFlagProvider : public DataProvider { diff --git a/src/modules/sasl.h b/src/modules/sasl.h index 0b0cf4fa9..e42cd3248 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 SASLHook : public classbase { diff --git a/src/modules/spanningtree.h b/src/modules/spanningtree.h index e1e5399b5..c48062275 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 98e9ada5b..ac20aea03 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 "inspsocket.h" #include -- cgit v1.3.1-10-gc9f91 From 4bcdbca8a5f420d159c553623f47fda19b57456f Mon Sep 17 00:00:00 2001 From: Justin Crawford Date: Sat, 14 Apr 2012 20:20:53 -0700 Subject: 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/socket.h | 4 ++-- include/threadengine.h | 4 ++-- include/threadengines/threadengine_pthread.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/remoteuser.h | 5 +++-- 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, 41 insertions(+), 40 deletions(-) (limited to 'src/modules') diff --git a/include/cull_list.h b/include/cull_list.h index dd8a9173b..f0bda7317 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 cc531a746..779b0c85d 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 /** Debug levels for use with InspIRCd::Log() * */ diff --git a/include/inspsocket.h b/include/inspsocket.h index e901adc6a..571f9ec80 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 /** * States which a socket may be in diff --git a/include/inspstring.h b/include/inspstring.h index ac69b74b5..62f1b17bd 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 diff --git a/include/logger.h b/include/logger.h index cd749ac51..4c22abf53 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/socket.h b/include/socket.h index 3abd79bcd..616cd1362 100644 --- a/include/socket.h +++ b/include/socket.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef INSPIRCD_SOCKET_H -#define INSPIRCD_SOCKET_H +#ifndef SOCKET_H +#define SOCKET_H #ifndef WIN32 diff --git a/include/threadengine.h b/include/threadengine.h index 54ae95374..5ed1831fe 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef THREADENGINE -#define THREADENGINE +#ifndef THREADENGINE_H +#define THREADENGINE_H #ifdef WINDOWS // #include "threadengines/threadengine_win32.h" diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index 9ebcd5f9a..32cfbfdd4 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 diff --git a/include/typedefs.h b/include/typedefs.h index 180118d9a..12f539444 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 #if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED) typedef nspace::hash_map > > user_hash; diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h index 9b8decc7d..0d45d5c3a 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 5c86c415a..38f329121 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 d4f3f7d42..c7ec33514 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 99fb96781..7cd74f2d7 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 16d671b8b..c43e14a9f 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 d339f850e..17c9be9dc 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/remoteuser.h b/src/modules/m_spanningtree/remoteuser.h index 0d22dd9ef..8f771d6ee 100644 --- a/src/modules/m_spanningtree/remoteuser.h +++ b/src/modules/m_spanningtree/remoteuser.h @@ -1,4 +1,5 @@ - +#ifndef M_SPANNINGTREE_REMOTEUSER_H +#define M_SPANNINGTREE_REMOTEUSER_H class CoreExport RemoteUser : public User { public: @@ -11,4 +12,4 @@ class CoreExport RemoteUser : public User virtual void DoWhois(User* src); }; - +#endif diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 98fb4ba78..fa567202d 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 5e6a41d92..4f91e4906 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 6e68d7601..1aac3c60d 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 64fe9b563..06bcf934b 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" #include "cull_list.h" -- cgit v1.3.1-10-gc9f91