diff options
64 files changed, 129 insertions, 129 deletions
diff --git a/include/bancache.h b/include/bancache.h index 917d2567a..cd7bd63d0 100644 --- a/include/bancache.h +++ b/include/bancache.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __BANCACHE_H -#define __BANCACHE_H +#ifndef BANCACHE_H +#define BANCACHE_H /** Stores a cached ban entry. * Each ban has one of these hashed in a hash_map to make for faster removal diff --git a/include/base.h b/include/base.h index 385907887..3f70f0195 100644 --- a/include/base.h +++ b/include/base.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __BASE_H__ -#define __BASE_H__ +#ifndef BASE_H +#define BASE_H #include <map> #include <deque> diff --git a/include/caller.h b/include/caller.h index b21025a2b..94bebdd89 100644 --- a/include/caller.h +++ b/include/caller.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CALLER__H__ -#define __CALLER__H__ +#ifndef CALLER_H +#define CALLER_H /** The templates below can be auto generated by tools/create_templates.pl. * They are used to represent a functor with a given number of parameters and diff --git a/include/channelmanager.h b/include/channelmanager.h index 7f43c88df..fb14b9dd0 100644 --- a/include/channelmanager.h +++ b/include/channelmanager.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CHANNELMANAGER_H -#define __CHANNELMANAGER_H +#ifndef CHANNELMANAGER_H +#define CHANNELMANAGER_H /** THe channel manager class allocates and deallocates channels and manages * the container which holds them. For some reason, nobody finished this. diff --git a/include/channels.h b/include/channels.h index cd6a5a4b8..d9c3c978f 100644 --- a/include/channels.h +++ b/include/channels.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CHANNELS_H__ -#define __CHANNELS_H__ +#ifndef CHANNELS_H +#define CHANNELS_H #include "membership.h" #include "mode.h" diff --git a/include/command_parse.h b/include/command_parse.h index bd778c3d2..35b72ecf5 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __COMMAND_PARSE_H -#define __COMMAND_PARSE_H +#ifndef COMMAND_PARSE_H +#define COMMAND_PARSE_H /** A list of dll/so files containing the command handlers for the core */ diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h index 19b7b74fd..a100a6ab9 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CMD_WHOWAS_H__ -#define __CMD_WHOWAS_H__ +#ifndef CMD_WHOWAS_H +#define CMD_WHOWAS_H #include "modules.h" struct WhowasRequest : public Request diff --git a/include/ctables.h b/include/ctables.h index 75795e48c..1c67702bb 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CTABLES_H__ -#define __CTABLES_H__ +#ifndef CTABLES_H +#define CTABLES_H /** Used to indicate command success codes */ diff --git a/include/cull_list.h b/include/cull_list.h index bf12cc6d8..a9e99385a 100644 --- a/include/cull_list.h +++ b/include/cull_list.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __CULLLIST_H__ -#define __CULLLIST_H__ +#ifndef CULLLIST_H +#define CULLLIST_H /** * The CullList class is used to delete objects at the end of the main loop to diff --git a/include/dns.h b/include/dns.h index b22a2032e..0e11f0d17 100644 --- a/include/dns.h +++ b/include/dns.h @@ -29,8 +29,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _DNS_H -#define _DNS_H +#ifndef DNS_H +#define DNS_H #include "socket.h" #include "hashcomp.h" diff --git a/include/dynamic.h b/include/dynamic.h index 01bdcdec5..b12581171 100644 --- a/include/dynamic.h +++ b/include/dynamic.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __DLL_H -#define __DLL_H +#ifndef DLL_H +#define DLL_H /** The DLLManager class is able to load a module file by filename, * and locate its init_module symbol. diff --git a/include/exitcodes.h b/include/exitcodes.h index 1e6286495..5492d6117 100644 --- a/include/exitcodes.h +++ b/include/exitcodes.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __EXITCODE_H__ -#define __EXITCODE_H__ +#ifndef EXITCODE_H +#define EXITCODE_H /** Valid exit codes to be used with InspIRCd::Exit() */ diff --git a/include/filelogger.h b/include/filelogger.h index 731a6dcad..6612a559b 100644 --- a/include/filelogger.h +++ b/include/filelogger.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __LOG_H__ -#define __LOG_H__ +#ifndef LOG_H +#define LOG_H #include "logger.h" diff --git a/include/hashcomp.h b/include/hashcomp.h index 07ec49a66..3042e366c 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef _HASHCOMP_H_ -#define _HASHCOMP_H_ +#ifndef HASHCOMP_H +#define HASHCOMP_H #include <cstring> #include <string> diff --git a/include/inspircd.h b/include/inspircd.h index 9568750c2..d17920fd3 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __INSPIRCD_H__ -#define __INSPIRCD_H__ +#ifndef INSPIRCD_H +#define INSPIRCD_H #define _FILE_OFFSET_BITS 64 #ifndef _LARGEFILE_SOURCE diff --git a/include/inspsocket.h b/include/inspsocket.h index f9d582637..07beb59c6 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __INSP_SOCKET_H__ -#define __INSP_SOCKET_H__ +#ifndef INSP_SOCKET_H +#define INSP_SOCKET_H #include "timer.h" diff --git a/include/inspstring.h b/include/inspstring.h index b11739999..20b16202e 100644 --- a/include/inspstring.h +++ b/include/inspstring.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __IN_INSPSTRING_H -#define __IN_INSPSTRING_H +#ifndef IN_INSPSTRING_H +#define IN_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 0e1bab4a3..6168bedef 100644 --- a/include/logger.h +++ b/include/logger.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __LOGMANAGER_H -#define __LOGMANAGER_H +#ifndef LOGMANAGER_H +#define LOGMANAGER_H /** This class implements a nonblocking writer. * Most people writing an ircd give little thought to their disk diff --git a/include/membership.h b/include/membership.h index 4ddb644dc..e71c676b9 100644 --- a/include/membership.h +++ b/include/membership.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __MEMBERSHIP_H__ -#define __MEMBERSHIP_H__ +#ifndef MEMBERSHIP_H +#define MEMBERSHIP_H class CoreExport Membership : public Extensible { diff --git a/include/mode.h b/include/mode.h index 87d79c7d5..904c5db27 100644 --- a/include/mode.h +++ b/include/mode.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __MODE_H -#define __MODE_H +#ifndef MODE_H +#define MODE_H #include "ctables.h" diff --git a/include/modules.h b/include/modules.h index 3601dd659..969565dcc 100644 --- a/include/modules.h +++ b/include/modules.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __MODULES_H -#define __MODULES_H +#ifndef MODULES_H +#define MODULES_H #include "dynamic.h" #include "base.h" diff --git a/include/numerics.h b/include/numerics.h index ad593f91e..7da6fc090 100644 --- a/include/numerics.h +++ b/include/numerics.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __NUMERICS_H -#define __NUMERICS_H +#ifndef NUMERICS_H +#define NUMERICS_H /* * This file is aimed providing a string that is easier to use than using the numeric diff --git a/include/protocol.h b/include/protocol.h index 03ede7ca8..89a913563 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __PROTOCOL_H__ -#define __PROTOCOL_H__ +#ifndef PROTOCOL_H +#define PROTOCOL_H #include "hashcomp.h" diff --git a/include/snomasks.h b/include/snomasks.h index d0062e162..a3c9e971e 100644 --- a/include/snomasks.h +++ b/include/snomasks.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __SNOMASKS_H__ -#define __SNOMASKS_H__ +#ifndef SNOMASKS_H +#define SNOMASKS_H class Snomask { diff --git a/include/socketengine.h b/include/socketengine.h index bba7bd399..0386ebd1d 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __SOCKETENGINE__ -#define __SOCKETENGINE__ +#ifndef SOCKETENGINE +#define SOCKETENGINE #include <vector> #include <string> diff --git a/include/testsuite.h b/include/testsuite.h index 2760ffb44..7354a005c 100644 --- a/include/testsuite.h +++ b/include/testsuite.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __TESTSUITE_H__ -#define __TESTSUITE_H__ +#ifndef TESTSUITE_H +#define TESTSUITE_H class TestSuite { diff --git a/include/threadengine.h b/include/threadengine.h index 1be775238..c73dd19bf 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __THREADENGINE__ -#define __THREADENGINE__ +#ifndef THREADENGINE +#define THREADENGINE #include <vector> #include <string> diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index 6124f4cf9..d5c7696af 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 +#define THREADENGINE_PTHREAD #include <pthread.h> #include "typedefs.h" diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index f0f98bbce..23d3e9233 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_WIN32THREAD +#define THREADENGINE_WIN32THREAD #include "inspircd_config.h" #include "base.h" diff --git a/include/typedefs.h b/include/typedefs.h index 5ca49493b..76fb929ca 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __TYPEDEF_H__ -#define __TYPEDEF_H__ +#ifndef TYPEDEF_H +#define TYPEDEF_H class BanCacheManager; class BanItem; diff --git a/include/usermanager.h b/include/usermanager.h index 6fdddf115..c62b92705 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __USERMANAGER_H -#define __USERMANAGER_H +#ifndef USERMANAGER_H +#define USERMANAGER_H #include <list> diff --git a/include/users.h b/include/users.h index 73ef3624e..109644c87 100644 --- a/include/users.h +++ b/include/users.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __USERS_H__ -#define __USERS_H__ +#ifndef USERS_H +#define USERS_H #include "socket.h" #include "inspsocket.h" diff --git a/include/xline.h b/include/xline.h index 1d458ae68..f7495847f 100644 --- a/include/xline.h +++ b/include/xline.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __XLINE_H -#define __XLINE_H +#ifndef XLINE_H +#define XLINE_H /** XLine is the base class for ban lines such as G lines and K lines. * Modules may derive from this, and their xlines will automatically be 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. diff --git a/win/colours.h b/win/colours.h index d266fe434..c25058b09 100644 --- a/win/colours.h +++ b/win/colours.h @@ -11,8 +11,8 @@ * --------------------------------------------------- */ -#ifndef __COLOURS_H -#define __COLOURS_H +#ifndef COLORS_H +#define COLORS_H #define TRED FOREGROUND_RED | FOREGROUND_INTENSITY #define TGREEN FOREGROUND_GREEN | FOREGROUND_INTENSITY diff --git a/win/win32service.h b/win/win32service.h index b6639a49b..99e1c7533 100644 --- a/win/win32service.h +++ b/win/win32service.h @@ -1,5 +1,5 @@ -#ifndef _WIN32SERVICE_H_ -#define _WIN32SERVICE_H_ +#ifndef WIN32SERVICE_H +#define WIN32SERVICE_H /* Hook for win32service.cpp to exit properly with the service specific error code */ void SetServiceStopped(int status); @@ -7,4 +7,4 @@ void SetServiceStopped(int status); /* Marks the service as running, not called until the config is parsed */ void SetServiceRunning(); -#endif
\ No newline at end of file +#endif |