Merge pull request #55 from Justasic/insp20

[2.0] Fixes for bug #12

33 files changed, 66 insertions, 66 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..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/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..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/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..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 b11739999..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 0e1bab4a3..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/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..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 <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..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 <vector>
 #include <string>
diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index 6124f4cf9..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 <pthread.h>
 #include "typedefs.h"
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index f0f98bbce..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 5ca49493b..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/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