Fixes for bug #12

diff --git a/include/bancache.h b/include/bancache.h
index 917d2567a4b50ccd2aa1c515002e204da235c5fd..cd7bd63d0df20900ef5ffe3bf15f1db326aa8696 100644 (file)
--- 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 3859078876c01f3969c96d77bb61285c58f7ee90..3f70f0195663fb0028c9ee65cea69b10e95d3ea7 100644 (file)
--- 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 b21025a2b40bb8c5d2f4d660d172fc86d30fe5af..94bebdd89e787d2dc932ab4a4d2f9b57b0b7eafc 100644 (file)
--- 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 7f43c88dff2711083e7d6689b26cf50eccfcef26..fb14b9dd02e3ed1ee046b1bb1935d11d0fbe6a3f 100644 (file)
--- 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 cd6a5a4b8f5422774382a7329d87eee16046d3d5..d9c3c978f93ae01d7174499d0cc28323de9ec1ee 100644 (file)
--- 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 bd778c3d2cd6f811af0d75ad698add77f2f3c1a1..35b72ecf5714775496c5ab234f8755fe6aec93fa 100644 (file)
--- 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 19b7b74fdd7a26ecc012d24608f3f3ba3aef1ce7..a100a6ab9e790720b12228f1b6eeb72bc581e399 100644 (file)
--- 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 75795e48ca47c25759c66274db0d58e66564d2e3..1c67702bb4c540ae3210c7c19d91d7c8444e4cec 100644 (file)
--- 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 bf12cc6d8e994d956304cdde294ab05660a3f144..a9e99385a312c508f9c1a95f00ed7533c35e287b 100644 (file)
--- 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 b22a2032e5eedd32c797df2c928dae6b0462adc9..0e11f0d17eddd2f94a438e33fabe23dd84ca2860 100644 (file)
--- 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 01bdcdec5e6f67e91deae41f8c1b5e62a04a8083..b125811714da870da66396b2dbe97799a34a8d3d 100644 (file)
--- 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 1e6286495738701a5bc3030eb433c0d992cf1dcf..5492d6117ea669dc9ecc3b4a207e90bfa93e3712 100644 (file)
--- 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 731a6dcad19adaa9de8a1a0e21342f509c90c6d4..6612a559b34d1eed62f0d90b3bb51cddcce331af 100644 (file)
--- 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 07ec49a665bf34e8827b5889035078e62d0a4bd9..3042e366c35580311f693126c3a164f06496c1fb 100644 (file)
--- 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 9568750c2db84513ec26b1b736460d82e45cfd31..d17920fd3f6802faed9875a875d1badead53c49f 100644 (file)
--- 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 f9d582637da26089f6febed12b71f032fa5700e8..07beb59c61ea3cfb2e33ca8cad5a0b903d051741 100644 (file)
--- 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 b11739999a70442ca8a4b449bcc531f48681bc9e..20b16202ed897980ce53a3cf19e7c579492f2712 100644 (file)
--- 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 0e1bab4a3968c0c2317843e1e1dac2ca9a26ab54..6168bedefdf1513cecdef27c4f5b5b200c1035f2 100644 (file)
--- 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 4ddb644dcf031c6e1213a9261201b0569378bd69..e71c676b9eecb22aaf0fe2d029515a3925981cb2 100644 (file)
--- 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 87d79c7d563902a4954a54690a3e0d58881d0348..904c5db272ddaae44f238c34770368325bea30c1 100644 (file)
--- 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 3601dd659253bdaf1fc18c40f83867ff6e45eb58..969565dcc7a932d607fa26b6e401f00894c272aa 100644 (file)
--- 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 ad593f91ee932bb86862a0fb61781c856115728d..7da6fc090a028a46a32fa80339acc125517aa13c 100644 (file)
--- 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 03ede7ca8ce3920a76afabf793a16f0461fb89fc..89a9135631ea4bfe3f1843045c885151c392309a 100644 (file)
--- 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 d0062e16266d642358cb72f9dad8bf00a7d44ddf..a3c9e971e40caf8f018db694bb801bd9451df79e 100644 (file)
--- 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 bba7bd39910a7d8de26a28fd3c9b4ba4eb5dd4d4..0386ebd1d13f689f679b19876d5ce7e2d774d743 100644 (file)
--- 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 2760ffb444fb76e2dd7bf1eb263d4f80e72d0823..7354a005c24f4c9a52f83a37df8121175dc67af8 100644 (file)
--- 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 1be7752380de348de67d5b52d9c0222fab0d2fba..c73dd19bf0fef2865ec24fb43755009fb212ee94 100644 (file)
--- 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 6124f4cf91cf551e54541516d7a8b584778de7fd..d5c7696af4801d1937e3fb604896cbc625c4843d 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
+#define THREADENGINE_PTHREAD
 
 #include <pthread.h>
 #include "typedefs.h"

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index f0f98bbce47edf4c4dc4052b39d1a905cf21bfa8..23d3e9233abcb34492e296d53934d92b346219ba 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_WIN32THREAD
+#define THREADENGINE_WIN32THREAD
 
 #include "inspircd_config.h"
 #include "base.h"

diff --git a/include/typedefs.h b/include/typedefs.h
index 5ca49493bff0121db9c5515af758055099e9822f..76fb929ca706290f31f4e26da2c9969eb5b7b7a6 100644 (file)
--- 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 6fdddf115abfe129b344901acf8532a5f0a4de2c..c62b927052e8d87d1792dc87ad0db77d0d69fba8 100644 (file)
--- 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 73ef3624e4cedbe864ab1b58e4ccd15bc3b2dc90..109644c87ad8ee3b5dd7f2f8b4b1790c97d4463b 100644 (file)
--- 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 1d458ae6811e044502c1e9af7283f697620d2fa5..f7495847f480240640cfaee7335efc6fc87191ea 100644 (file)
--- 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 e3bfbe55ebb110c547b712e37fae1d21c3a2a474..aafabba282b474bf885f25c18c834341753d91b4 100644 (file)
--- 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 4b1e3e9be88bb56afdf69e3b1ea6fd10e6086174..bac56807e93157ef8d19bb85a11c498fc4d1ae21 100644 (file)
--- 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 537d39208a9abc97688a8c5561c9dde8d648deef..6c8586c01b9480d99e878ff138bc8abae62a46e5 100644 (file)
--- 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 f964c7442fbc33c391676fee5bfdd380fc25e981..a26cfed556dbfe765aee87e81edc9e55e0591d86 100644 (file)
--- 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 17a71688a809ec8ac80108bdeafc89b76a7f1f73..e473053e58db4659d482c2e3ccfcbde912f65890 100644 (file)
--- 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 951c798eafc5d6b836532549345febeec94c7833..e48d452cd61131a7f94bdf5d7f2e7267c3b14990 100644 (file)
--- 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 4a2f4f7df3f001a6e9533de4b3e018cf12cc290e..ca970bbb606d3102a3af02d6ad868340e7e96320 100644 (file)
--- 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 8fbccb77f9311c42ffff8bb99001152fc33d2604..6238bff87bef06f5208f6a9d2cc4cd1e9edbb309 100644 (file)
--- 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 126b49ee408442ec7e6797c9d33c884935969103..5b00524d7e2341a61947a6b001494a9e753bc5ad 100644 (file)
--- 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 3064c9440642738c4c0dcb93f4bdb4cd1c8662bc..eacce31bb719cdad339ef0ddcb915de5328c8d16 100644 (file)
--- 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 8f4631cc8d41dff2dfadca3c68937e2c49e43dfe..77f84ec4d43f11be9aa4ddc755a2b09e6f4e9ded 100644 (file)
--- 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 7e93f0ddcbc4090d5c6b32f95ed2555c3a644622..c2b8abfd15e2a7bacef3190b301d1cc0ad72be57 100644 (file)
--- 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 40e619ea311a206650a456b3f9eddefe17f218e2..18876be208e978df0898e6bd9a24aa581ca34e4e 100644 (file)
--- 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 d2d094c85f39429f36343ef7e9c87dcf1c5e4051..d37b509328c1bf61df8dce9820df937683310185 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 CAP_H
+#define CAP_H
 
 #include <map>
 #include <string>

diff --git a/src/modules/m_regex.h b/src/modules/m_regex.h
index 523f9f0d32f4bbce6ca44a65feba28a0cb916a61..fc196fac180ffe9982626d5cebaeb3edb24852f9 100644 (file)
--- 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 2ed6c9fff9b62f0676c8c06ebe47fbede0ab3932..1b370aa0b2ff91160191239de003e11e04514ddd 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 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 09591b4e43882a17b49ea70722ed9414c94fc253..0a0193c2f359fd83b85f6eb84703e75fd16bbd99 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 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 c60cb0bb73540072b7cadebbbe6e849b640a36c1..1ca73c69d319abac57c41f941b685d81957153db 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 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 ce7709189dad36ed37230655d658ece35c812b78..44abd452f31c2c655125881cfe25740a82c0695f 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 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 762946901ac4354231b7d6fe172ba5c822989a7c..ed421ad6e4ef3b7f91805377b4c60f41846e4673 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 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 348debe474dc11a89f630c82919bc92576d15afe..f69a9bc3c4eb3098f21d123ff6dc75bc9a195d60 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 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 7eb19d9a171600d65db9334bde7d7f56dfda583c..e7fbac619c9ec3fba3386e68fe2e66ebcb3ab5ab 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 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 2ad4d68afbc224f959c8e256a3e0df8c91077112..00a7306222a14cee1fc957a4b61172fc7b6b5cde 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 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 2e527ae1281b06841124b3cfb8aaa5ff77680393..36fec43efec46192318b062baaca46e359498ba0 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 ST__UTIL
+#define ST__UTIL
 
 #include "inspircd.h"
 

diff --git a/src/modules/sasl.h b/src/modules/sasl.h
index 9abfc558a08d0abd0c66b51e54f4e1616678ad64..927a4fb028e380c1d10672e6b0dbb44cf7022ac8 100644 (file)
--- 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 ec3c362146629a22aef29d10c716fc66d6a52926..8a38d55884f933df8cfe3f7819c140aaf73a847c 100644 (file)
--- 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 e66e423aabd52d2c245a8e3210af91c9132394eb..060c64a0e8958f9ffc0f7fc1231f8b4f9b35a6b0 100644 (file)
--- 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 d20ac35a205e47f45f8ef8a51aab72052731a9a3..b84cbc5de40fa66b73ed4c9f5686a232f4efe4f6 100644 (file)
--- 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 258c89709ace33ee1129d47b43a87960c8279d76..8a14c358bde78d5b9a6bfd5448cdb989e6dcfafe 100644 (file)
--- 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 d266fe434b89315ab74ffce2f64dc3933cb7bf4d..c25058b096b8b964762dc5aa3fe0ac3bffe7a45e 100644 (file)
--- 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 b6639a49bfdb287f703a634b97d545a1348c495c..99e1c75334c208129f06b15bfb5c9a70f08652f1 100644 (file)
--- 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