diff options
102 files changed, 121 insertions, 307 deletions
@@ -876,8 +876,7 @@ sub writefiles { open(FILEHANDLE, ">include/config.h.tmp"); print FILEHANDLE <<EOF; /* Auto generated by configure, do not modify! */ -#ifndef __CONFIGURATION_AUTO__ -#define __CONFIGURATION_AUTO__ +#pragma once #define BRANCH "$branch" #define VERSION "$version" @@ -946,7 +945,7 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; $config{SOCKETENGINE} = "socketengine_select"; } } - print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n"; + print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n"; close(FILEHANDLE); my $file = 'include/config.h'; diff --git a/include/bancache.h b/include/bancache.h index 9cff91802..450f711c4 100644 --- a/include/bancache.h +++ b/include/bancache.h @@ -18,8 +18,7 @@ */ -#ifndef BANCACHE_H -#define BANCACHE_H +#pragma once /** Stores a cached ban entry. * Each ban has one of these hashed in a hash_map to make for faster removal @@ -84,5 +83,3 @@ class CoreExport BanCacheManager } ~BanCacheManager(); }; - -#endif diff --git a/include/base.h b/include/base.h index 5308ed655..117ffab76 100644 --- a/include/base.h +++ b/include/base.h @@ -20,8 +20,7 @@ */ -#ifndef BASE_H -#define BASE_H +#pragma once #include <map> #include <deque> @@ -255,5 +254,3 @@ class CoreExport ServiceProvider : public classbase virtual ~ServiceProvider(); }; - -#endif diff --git a/include/caller.h b/include/caller.h index 563577ac2..f69ff6796 100644 --- a/include/caller.h +++ b/include/caller.h @@ -19,8 +19,7 @@ */ -#ifndef CALLER_H -#define CALLER_H +#pragma once /* Pending some sort of C++11 support */ #if 0 @@ -355,5 +354,3 @@ template <typename ReturnType, typename Param1, typename Param2, typename Param3 class CoreExport NAME : public HandlerBase8<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: NAME() { } virtual ~NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8); } #endif - -#endif diff --git a/include/channels.h b/include/channels.h index 43302552e..3c60fcd6a 100644 --- a/include/channels.h +++ b/include/channels.h @@ -20,8 +20,7 @@ */ -#ifndef CHANNELS_H -#define CHANNELS_H +#pragma once #include "membership.h" #include "mode.h" @@ -354,5 +353,3 @@ class CoreExport Channel : public Extensible, public InviteBase */ ModResult GetExtBanStatus(User *u, char type); }; - -#endif diff --git a/include/command_parse.h b/include/command_parse.h index f6ff588e1..e865018e4 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -20,8 +20,7 @@ */ -#ifndef COMMAND_PARSE_H -#define COMMAND_PARSE_H +#pragma once /** A list of dll/so files containing the command handlers for the core */ @@ -175,5 +174,3 @@ const int duration_multi[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - -#endif diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h index 590c11172..7e1eeefc9 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -19,8 +19,8 @@ */ -#ifndef CMD_WHOWAS_H -#define CMD_WHOWAS_H +#pragma once + #include "modules.h" /* Forward ref for typedefs */ @@ -114,5 +114,3 @@ class WhoWasGroup */ ~WhoWasGroup(); }; - -#endif diff --git a/include/configparser.h b/include/configparser.h index 9b2cd4527..8292fdda5 100644 --- a/include/configparser.h +++ b/include/configparser.h @@ -17,6 +17,8 @@ */ +#pragma once + struct fpos { std::string filename; @@ -76,5 +78,3 @@ struct FileWrapper } } }; - - diff --git a/include/configreader.h b/include/configreader.h index b137ee544..a2dfd2a34 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -21,8 +21,7 @@ */ -#ifndef INSPIRCD_CONFIGREADER -#define INSPIRCD_CONFIGREADER +#pragma once #include <sstream> #include <string> @@ -569,5 +568,3 @@ class CoreExport ConfigReaderThread : public Thread void Finish(); bool IsDone() { return done; } }; - -#endif diff --git a/include/consolecolors.h b/include/consolecolors.h index f7ca1335e..9b7e0670a 100644 --- a/include/consolecolors.h +++ b/include/consolecolors.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONSOLECOLORS_H -#define CONSOLECOLORS_H + +#pragma once #include <ostream> @@ -96,5 +96,3 @@ inline std::ostream& con_reset(std::ostream &s) } #endif - -#endif diff --git a/include/ctables.h b/include/ctables.h index f9cd08cb3..2ccca0f7b 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -21,8 +21,7 @@ */ -#ifndef CTABLES_H -#define CTABLES_H +#pragma once /** Used to indicate command success codes */ @@ -252,5 +251,3 @@ class CoreExport SplitCommand : public Command translation.push_back(x5);translation.push_back(x6);translation.push_back(x7); #define TRANSLATE8(x1,x2,x3,x4,x5,x6,x7,x8) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\ translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);translation.push_back(x8); - -#endif diff --git a/include/cull_list.h b/include/cull_list.h index 75b08b7a3..ac64dced2 100644 --- a/include/cull_list.h +++ b/include/cull_list.h @@ -20,8 +20,7 @@ */ -#ifndef CULL_LIST_H -#define CULL_LIST_H +#pragma once /** * The CullList class is used to delete objects at the end of the main loop to @@ -58,6 +57,3 @@ class CoreExport ActionList void Run(); }; - -#endif - diff --git a/include/dns.h b/include/dns.h index 3c8e55d08..d03af8918 100644 --- a/include/dns.h +++ b/include/dns.h @@ -18,7 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - /* dns.h - dns library very very loosely based on firedns, Copyright (C) 2002 Ian Gulliver @@ -37,8 +36,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 + +#pragma once #include "socket.h" #include "hashcomp.h" @@ -438,6 +437,3 @@ class CoreExport DNS : public EventHandler */ int PruneCache(); }; - -#endif - diff --git a/include/dynamic.h b/include/dynamic.h index 5e66ddbb0..d42cf61bf 100644 --- a/include/dynamic.h +++ b/include/dynamic.h @@ -20,8 +20,7 @@ */ -#ifndef DLL_H -#define DLL_H +#pragma once /** The DLLManager class is able to load a module file by filename, * and locate its init_module symbol. @@ -65,6 +64,3 @@ class CoreExport DLLManager : public classbase /** Get detailed version information from the module file */ std::string GetVersion(); }; - -#endif - diff --git a/include/exitcodes.h b/include/exitcodes.h index d4890c94d..888431969 100644 --- a/include/exitcodes.h +++ b/include/exitcodes.h @@ -19,8 +19,7 @@ */ -#ifndef EXITCODE_H -#define EXITCODE_H +#pragma once /** Valid exit codes to be used with InspIRCd::Exit() */ @@ -52,6 +51,3 @@ enum ExitStatus * human-readable strings to be shown on shutdown. */ extern const char * ExitCodes[]; - -#endif - diff --git a/include/extensible.h b/include/extensible.h index bcc4992bb..e062f66a5 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -17,8 +17,7 @@ */ -#ifndef EXTENSIBLE_H -#define EXTENSIBLE_H +#pragma once #include <stdint.h> @@ -190,5 +189,3 @@ class CoreExport StringExtItem : public ExtensionItem void unset(Extensible* container); void free(void* item); }; - -#endif diff --git a/include/filelogger.h b/include/filelogger.h index 739e4d94b..091dc9a03 100644 --- a/include/filelogger.h +++ b/include/filelogger.h @@ -18,8 +18,7 @@ */ -#ifndef FILELOGGER_H -#define FILELOGGER_H +#pragma once #include "logger.h" @@ -51,6 +50,3 @@ class CoreExport FileLogStream : public LogStream virtual void OnLog(int loglevel, const std::string &type, const std::string &msg); }; - -#endif - diff --git a/include/hashcomp.h b/include/hashcomp.h index 2932f2a48..e4b3cfe79 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -22,8 +22,7 @@ */ -#ifndef HASHCOMP_H -#define HASHCOMP_H +#pragma once #include <cstring> #include <string> @@ -600,5 +599,3 @@ namespace std } } - -#endif diff --git a/include/inspircd.h b/include/inspircd.h index f61d48529..0ec2c7465 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -23,8 +23,7 @@ */ -#ifndef INSPIRCD_H -#define INSPIRCD_H +#pragma once #define _FILE_OFFSET_BITS 64 #ifndef _LARGEFILE_SOURCE @@ -877,6 +876,3 @@ class CommandModule : public Module return Version(cmd.name, VF_VENDOR|VF_CORE); } }; - -#endif - diff --git a/include/inspsocket.h b/include/inspsocket.h index c62c5a250..75c6dc511 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -21,8 +21,7 @@ */ -#ifndef INSPSOCKET_H -#define INSPSOCKET_H +#pragma once #include "timer.h" @@ -234,4 +233,3 @@ class CoreExport BufferedSocket : public StreamSocket inline Module* StreamSocket::GetIOHook() { return IOHook; } inline void StreamSocket::AddIOHook(Module* m) { IOHook = m; } inline void StreamSocket::DelIOHook() { IOHook = NULL; } -#endif diff --git a/include/inspstring.h b/include/inspstring.h index 494ce92b1..7a433427a 100644 --- a/include/inspstring.h +++ b/include/inspstring.h @@ -18,13 +18,11 @@ */ -#ifndef INSPSTRING_H -#define INSPSTRING_H +#pragma once // This (config) is needed as inspstring doesn't pull in the central header #include "config.h" #include <cstring> -//#include <cstddef> #ifndef HAS_STRLCPY /** strlcpy() implementation for systems that don't have it (linux) */ @@ -52,6 +50,3 @@ CoreExport std::string BinToHex(const std::string& data); CoreExport std::string BinToBase64(const std::string& data, const char* table = NULL, char pad = 0); /** Base64 decode */ CoreExport std::string Base64ToBin(const std::string& data, const char* table = NULL); - -#endif - diff --git a/include/listmode.h b/include/listmode.h index b070b90f9..1c6f70d6f 100644 --- a/include/listmode.h +++ b/include/listmode.h @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #pragma once /** The base class for list modes, should be inherited. diff --git a/include/logger.h b/include/logger.h index eee964e15..7b4c45f1c 100644 --- a/include/logger.h +++ b/include/logger.h @@ -18,8 +18,7 @@ */ -#ifndef LOGGER_H -#define LOGGER_H +#pragma once /** Simple wrapper providing periodic flushing to a disk-backed file. */ @@ -211,5 +210,3 @@ class CoreExport LogManager */ void Log(const std::string &type, int loglevel, const char *fmt, ...) CUSTOM_PRINTF(4, 5); }; - -#endif diff --git a/include/membership.h b/include/membership.h index 436a9371c..44f588417 100644 --- a/include/membership.h +++ b/include/membership.h @@ -17,8 +17,7 @@ */ -#ifndef MEMBERSHIP_H -#define MEMBERSHIP_H +#pragma once class CoreExport Membership : public Extensible { @@ -59,5 +58,3 @@ class Invitation : public classbase static void Create(Channel* c, LocalUser* u, time_t timeout); static Invitation* Find(Channel* c, LocalUser* u, bool check_expired = true); }; - -#endif diff --git a/include/mode.h b/include/mode.h index de8d4c5f8..57f1b0669 100644 --- a/include/mode.h +++ b/include/mode.h @@ -20,8 +20,7 @@ */ -#ifndef MODE_H -#define MODE_H +#pragma once #include "ctables.h" @@ -563,5 +562,3 @@ class CoreExport ModeParser */ std::string BuildPrefixes(bool lettersAndModes = true); }; - -#endif diff --git a/include/modules.h b/include/modules.h index 9ba238da5..783edd9b1 100644 --- a/include/modules.h +++ b/include/modules.h @@ -23,8 +23,7 @@ */ -#ifndef MODULES_H -#define MODULES_H +#pragma once #include "dynamic.h" #include "base.h" @@ -1645,5 +1644,3 @@ struct AllModuleList { #define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>) #endif - -#endif diff --git a/src/modules/account.h b/include/modules/account.h index ba671ba0b..c00b044e4 100644 --- a/src/modules/account.h +++ b/include/modules/account.h @@ -17,8 +17,7 @@ */ -#ifndef ACCOUNT_H -#define ACCOUNT_H +#pragma once #include <map> #include <string> @@ -40,5 +39,3 @@ inline AccountExtItem* GetAccountExtItem() { return static_cast<AccountExtItem*>(ServerInstance->Extensions.GetItem("accountname")); } - -#endif diff --git a/src/modules/m_cap.h b/include/modules/cap.h index 409671f48..2ed8df494 100644 --- a/src/modules/m_cap.h +++ b/include/modules/cap.h @@ -18,8 +18,7 @@ */ -#ifndef M_CAP_H -#define M_CAP_H +#pragma once class CapEvent : public Event { @@ -89,4 +88,3 @@ class GenericCap } }; -#endif diff --git a/src/modules/hash.h b/include/modules/hash.h index dd7f082b0..da04c45ba 100644 --- a/src/modules/hash.h +++ b/include/modules/hash.h @@ -17,8 +17,7 @@ */ -#ifndef HASH_H -#define HASH_H +#pragma once #include "modules.h" @@ -57,5 +56,3 @@ class HashProvider : public DataProvider return sum(hmac1); } }; - -#endif diff --git a/src/modules/httpd.h b/include/modules/httpd.h index 57c60b3b2..d1746e862 100644 --- a/src/modules/httpd.h +++ b/include/modules/httpd.h @@ -21,10 +21,9 @@ */ -#include "base.h" +#pragma once -#ifndef HTTPD_H -#define HTTPD_H +#include "base.h" #include <string> #include <sstream> @@ -202,5 +201,3 @@ class HTTPDocumentResponse : public Request { } }; - -#endif diff --git a/src/modules/m_regex.h b/include/modules/regex.h index 0233f938a..875f942bc 100644 --- a/src/modules/m_regex.h +++ b/include/modules/regex.h @@ -18,8 +18,7 @@ */ -#ifndef M_REGEX_H -#define M_REGEX_H +#pragma once #include "inspircd.h" @@ -54,5 +53,3 @@ class RegexFactory : public DataProvider virtual Regex* Create(const std::string& expr) = 0; }; - -#endif diff --git a/src/modules/sasl.h b/include/modules/sasl.h index f67351104..321711a68 100644 --- a/src/modules/sasl.h +++ b/include/modules/sasl.h @@ -17,8 +17,7 @@ */ -#ifndef SASL_H -#define SASL_H +#pragma once class SASLFallback : public Event { @@ -30,5 +29,3 @@ class SASLFallback : public Event Send(); } }; - -#endif diff --git a/src/modules/spanningtree.h b/include/modules/spanningtree.h index 212f35ff3..99f4f9fc4 100644 --- a/src/modules/spanningtree.h +++ b/include/modules/spanningtree.h @@ -17,8 +17,7 @@ */ -#ifndef SPANNINGTREE_H -#define SPANNINGTREE_H +#pragma once struct AddServerEvent : public Event { @@ -39,5 +38,3 @@ struct DelServerEvent : public Event Send(); } }; - -#endif diff --git a/src/modules/sql.h b/include/modules/sql.h index 436cd1da8..a671cc95c 100644 --- a/src/modules/sql.h +++ b/include/modules/sql.h @@ -17,8 +17,7 @@ */ -#ifndef INSPIRCD_SQLAPI_3 -#define INSPIRCD_SQLAPI_3 +#pragma once /** Defines the error types which SQLerror may be set to */ @@ -183,5 +182,3 @@ class SQLProvider : public DataProvider userinfo["uuid"] = user->uuid; } }; - -#endif diff --git a/src/modules/ssl.h b/include/modules/ssl.h index 9deafb830..a79dcc9ef 100644 --- a/src/modules/ssl.h +++ b/include/modules/ssl.h @@ -18,8 +18,7 @@ */ -#ifndef SSL_H -#define SSL_H +#pragma once #include <map> #include <string> @@ -171,5 +170,3 @@ struct UserCertificateRequest : public Request return ""; } }; - -#endif diff --git a/include/numerics.h b/include/numerics.h index 4fce4cb6d..997a71d3a 100644 --- a/include/numerics.h +++ b/include/numerics.h @@ -18,8 +18,7 @@ */ -#ifndef NUMERICS_H -#define NUMERICS_H +#pragma once /* * This file is aimed providing a string that is easier to use than using the numeric @@ -157,5 +156,3 @@ enum Numerics ERR_CANTLOADMODULE = 974, // insp-specific RPL_LOADEDMODULE = 975 // insp-specific }; - -#endif diff --git a/include/protocol.h b/include/protocol.h index aabb5b022..4488fcea4 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -18,8 +18,7 @@ */ -#ifndef PROTOCOL_H -#define PROTOCOL_H +#pragma once #include "hashcomp.h" @@ -135,6 +134,3 @@ class ProtocolInterface */ virtual void GetServerList(ProtoServerList &sl) { } }; - -#endif - diff --git a/include/snomasks.h b/include/snomasks.h index 85ad26f71..c5d594eeb 100644 --- a/include/snomasks.h +++ b/include/snomasks.h @@ -20,8 +20,7 @@ */ -#ifndef SNOMASKS_H -#define SNOMASKS_H +#pragma once class Snomask { @@ -106,5 +105,3 @@ class CoreExport SnomaskManager */ void FlushSnotices(); }; - -#endif diff --git a/include/socket.h b/include/socket.h index 5f6705124..f6934b771 100644 --- a/include/socket.h +++ b/include/socket.h @@ -22,8 +22,7 @@ */ -#ifndef INSPIRCD_SOCKET_H -#define INSPIRCD_SOCKET_H +#pragma once #ifndef _WIN32 @@ -165,6 +164,3 @@ class CoreExport ListenSocket : public EventHandler */ void AcceptInternal(); }; - -#endif - diff --git a/include/socketengine.h b/include/socketengine.h index 58af73589..fd199c324 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -20,8 +20,7 @@ */ -#ifndef SOCKETENGINE_H -#define SOCKETENGINE_H +#pragma once #include <vector> #include <string> @@ -492,6 +491,3 @@ public: }; SocketEngine* CreateSocketEngine(); - -#endif - diff --git a/include/testsuite.h b/include/testsuite.h index f91e508c9..43064b063 100644 --- a/include/testsuite.h +++ b/include/testsuite.h @@ -16,8 +16,7 @@ */ -#ifndef TESTSUITE_H -#define TESTSUITE_H +#pragma once class TestSuite { @@ -32,5 +31,3 @@ class TestSuite bool DoSpaceSepStreamTests(); bool DoGenerateUIDTests(); }; - -#endif diff --git a/include/threadengine.h b/include/threadengine.h index e0ed9ec40..39f150566 100644 --- a/include/threadengine.h +++ b/include/threadengine.h @@ -18,8 +18,7 @@ */ -#ifndef THREADENGINE_H -#define THREADENGINE_H +#pragma once #include <vector> #include <string> @@ -172,6 +171,3 @@ class CoreExport SocketThread : public Thread */ virtual void OnNotify() = 0; }; - -#endif - diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h index 5168ed238..253e8d223 100644 --- a/include/threadengines/threadengine_pthread.h +++ b/include/threadengines/threadengine_pthread.h @@ -18,8 +18,7 @@ */ -#ifndef THREADENGINE_PTHREAD_H -#define THREADENGINE_PTHREAD_H +#pragma once #include <pthread.h> #include "typedefs.h" @@ -153,6 +152,3 @@ class ThreadSignalData public: ThreadSignalSocket* sock; }; - - -#endif diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index 2fdcac565..59848bd44 100644 --- a/include/threadengines/threadengine_win32.h +++ b/include/threadengines/threadengine_win32.h @@ -18,8 +18,7 @@ */ -#ifndef THREADENGINE_WIN32_H -#define THREADENGINE_WIN32_H +#pragma once #include "config.h" #include "base.h" @@ -152,6 +151,3 @@ class ThreadSignalData connFD = -1; } }; - -#endif - diff --git a/include/timer.h b/include/timer.h index 9bb7128b8..0dda6876e 100644 --- a/include/timer.h +++ b/include/timer.h @@ -19,8 +19,7 @@ */ -#ifndef INSPIRCD_TIMER_H -#define INSPIRCD_TIMER_H +#pragma once /** Timer class for one-second resolution timers * Timer provides a facility which allows module @@ -149,6 +148,3 @@ class CoreExport TimerManager */ static bool TimerComparison( Timer *one, Timer*two); }; - -#endif - diff --git a/include/typedefs.h b/include/typedefs.h index e73790667..be7d4f796 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -19,8 +19,7 @@ */ -#ifndef TYPEDEFS_H -#define TYPEDEFS_H +#pragma once class BanCacheManager; class BanItem; @@ -154,7 +153,3 @@ typedef XLineContainer::iterator ContainerIter; /** An interator in an XLineLookup */ typedef XLineLookup::iterator LookupIter; - - -#endif - diff --git a/include/uid.h b/include/uid.h index 17061bdee..3783e7ada 100644 --- a/include/uid.h +++ b/include/uid.h @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#pragma once /** * This is the maximum length of a UUID (unique user identifier). @@ -24,4 +25,3 @@ */ #define UUID_LENGTH 10 - diff --git a/include/usermanager.h b/include/usermanager.h index 812d8e2f2..560db17f2 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -17,8 +17,7 @@ */ -#ifndef USERMANAGER_H -#define USERMANAGER_H +#pragma once #include <list> @@ -168,5 +167,3 @@ class CoreExport UserManager */ void ServerPrivmsgAll(const char* text, ...) CUSTOM_PRINTF(2, 3); }; - -#endif diff --git a/include/users.h b/include/users.h index c5c936c13..34bcc9c73 100644 --- a/include/users.h +++ b/include/users.h @@ -22,8 +22,7 @@ */ -#ifndef USERS_H -#define USERS_H +#pragma once #include "socket.h" #include "inspsocket.h" @@ -953,5 +952,3 @@ class CoreExport UserResolver : public Resolver */ void OnError(ResolverError e, const std::string &errormessage); }; - -#endif diff --git a/include/xline.h b/include/xline.h index 4094e05df..119e29dc1 100644 --- a/include/xline.h +++ b/include/xline.h @@ -20,8 +20,7 @@ */ -#ifndef XLINE_H -#define XLINE_H +#pragma once /** 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 @@ -527,4 +526,3 @@ class CoreExport XLineManager void InvokeStats(const std::string &type, int numeric, User* user, string_list &results); }; -#endif diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index b71c3543e..2a7e2f878 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -25,7 +25,7 @@ #include "inspircd.h" #include <mysql.h> -#include "sql.h" +#include "modules/sql.h" #ifdef _WIN32 # pragma comment(lib, "mysqlclient.lib") diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index ea94834f3..6d2e0c88a 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -26,7 +26,7 @@ #include <cstdlib> #include <sstream> #include <libpq-fe.h> -#include "sql.h" +#include "modules/sql.h" /* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */ /* $CompileFlags: -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */ diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index e9d9aba8a..b2dd53515 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -20,10 +20,10 @@ #include "inspircd.h" #include <pcre.h> -#include "m_regex.h" +#include "modules/regex.h" /* $ModDesc: Regex Provider Module for PCRE */ -/* $ModDep: m_regex.h */ +/* $ModDep: modules/regex.h */ /* $CompileFlags: exec("pcre-config --cflags") */ /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */ diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp index 513f54cfc..2c1295fd8 100644 --- a/src/modules/extra/m_regex_posix.cpp +++ b/src/modules/extra/m_regex_posix.cpp @@ -19,12 +19,12 @@ #include "inspircd.h" -#include "m_regex.h" +#include "modules/regex.h" #include <sys/types.h> #include <regex.h> /* $ModDesc: Regex Provider Module for POSIX Regular Expressions */ -/* $ModDep: m_regex.h */ +/* $ModDep: modules/regex.h */ class POSIXRegexException : public ModuleException { diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp index 64d479cbc..3c15f5568 100644 --- a/src/modules/extra/m_regex_stdlib.cpp +++ b/src/modules/extra/m_regex_stdlib.cpp @@ -17,7 +17,7 @@ */ #include "inspircd.h" -#include "m_regex.h" +#include "modules/regex.h" #include <regex> /* $ModDesc: Regex Provider Module for std::regex Regular Expressions */ @@ -25,7 +25,7 @@ * Specify the Regular Expression engine to use here. Valid settings are * bre, ere, awk, grep, egrep, ecmascript (default if not specified)*/ /* $CompileFlags: -std=c++11 */ -/* $ModDep: m_regex.h */ +/* $ModDep: modules/regex.h */ class StdRegexException : public ModuleException { diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index b5bd7d012..c352d5fdf 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -19,14 +19,14 @@ #include "inspircd.h" -#include "m_regex.h" +#include "modules/regex.h" #include <sys/types.h> #include <tre/regex.h> /* $ModDesc: Regex Provider Module for TRE Regular Expressions */ /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */ /* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */ -/* $ModDep: m_regex.h */ +/* $ModDep: modules/regex.h */ class TRERegexException : public ModuleException { diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 40f44557a..5cffa3640 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -22,7 +22,7 @@ #include "inspircd.h" #include <sqlite3.h> -#include "sql.h" +#include "modules/sql.h" #ifdef _WIN32 # pragma comment(lib, "sqlite3.lib") diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 31beb258f..1caacaa0f 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -25,8 +25,8 @@ #include <gcrypt.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> -#include "ssl.h" -#include "m_cap.h" +#include "modules/ssl.h" +#include "modules/cap.h" #ifdef _WIN32 # pragma comment(lib, "libgnutls.lib") diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 427439eb3..5a0e56db2 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -33,7 +33,7 @@ #include "inspircd.h" #include <openssl/ssl.h> #include <openssl/err.h> -#include "ssl.h" +#include "modules/ssl.h" #ifdef _WIN32 # pragma comment(lib, "libcrypto.lib") diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index cf4144935..63f0085ed 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -25,7 +25,6 @@ #include "listmode.h" /* $ModDesc: Provides support for the +e channel mode */ -/* $ModDep: ../../include/listmode.h */ /* Written by Om<om@inspircd.org>, April 2005. */ /* Rewritten to use the listmode utility by Om, December 2005 */ diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 59b92eb27..ee9c96936 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -19,7 +19,7 @@ #include "inspircd.h" -#include "m_cap.h" +#include "modules/cap.h" /* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */ diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 5bec93f03..9eb9a8da9 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -24,7 +24,7 @@ #include "inspircd.h" -#include "hash.h" +#include "modules/hash.h" /* $ModDesc: Provides masking of user hostnames */ diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 7e7ded306..027222b3a 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -22,7 +22,7 @@ #include "inspircd.h" #include "xline.h" -#include "m_regex.h" +#include "modules/regex.h" /* $ModDesc: Text (spam) filtering */ diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 46f0d6907..d768a9436 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -23,10 +23,10 @@ #include "inspircd.h" -#include "httpd.h" +#include "modules/httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ -/* $ModDep: httpd.h */ +/* $ModDep: modules/httpd.h */ class ModuleHttpServer; diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 70c36a154..aaf03802c 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -19,7 +19,7 @@ #include "inspircd.h" -#include "httpd.h" +#include "modules/httpd.h" #include "protocol.h" /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */ diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp index 88594e2fe..cfdaa4290 100644 --- a/src/modules/m_httpd_config.cpp +++ b/src/modules/m_httpd_config.cpp @@ -19,7 +19,7 @@ #include "inspircd.h" -#include "httpd.h" +#include "modules/httpd.h" #include "protocol.h" /* $ModDesc: Allows for the server configuration to be viewed over HTTP via m_httpd.so */ diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 2eb9f7cb7..7d7ebcf3d 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -22,7 +22,7 @@ #include "inspircd.h" -#include "httpd.h" +#include "modules/httpd.h" #include "xline.h" #include "protocol.h" diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 2d8382832..69498a942 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -25,7 +25,6 @@ #include "listmode.h" /* $ModDesc: Provides support for the +I channel mode */ -/* $ModDep: ../../include/listmode.h */ /* * Written by Om <om@inspircd.org>, April 2005. diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index cc2e6c322..0e28d59f2 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -19,8 +19,8 @@ /* $ModDesc: Provides support for extended-join, away-notify and account-notify CAP capabilities */ #include "inspircd.h" -#include "account.h" -#include "m_cap.h" +#include "modules/account.h" +#include "modules/cap.h" class ModuleIRCv3 : public Module { diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index c42507ea1..feba027f6 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -27,7 +27,7 @@ #ifdef HAS_STDINT #include <stdint.h> #endif -#include "hash.h" +#include "modules/hash.h" /* The four core functions - F1 is optimized somewhat */ #define F1(x, y, z) (z ^ (x & (y ^ z))) diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index 4ba8613d8..48d8cc871 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -21,7 +21,7 @@ #include "inspircd.h" -#include "m_cap.h" +#include "modules/cap.h" /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 98462780b..e913f4925 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -21,7 +21,7 @@ /* $ModDesc: Allows for hashed oper passwords */ #include "inspircd.h" -#include "hash.h" +#include "modules/hash.h" /* Handle /MKPASSWD */ diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp index a3088cabd..f53ac2b9c 100644 --- a/src/modules/m_regex_glob.cpp +++ b/src/modules/m_regex_glob.cpp @@ -18,7 +18,7 @@ */ -#include "m_regex.h" +#include "modules/regex.h" #include "inspircd.h" /* $ModDesc: Regex module using plain wildcard matching. */ diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp index 9d4cd5f60..98250d2a7 100644 --- a/src/modules/m_regonlycreate.cpp +++ b/src/modules/m_regonlycreate.cpp @@ -21,7 +21,7 @@ #include "inspircd.h" -#include "account.h" +#include "modules/account.h" /* $ModDesc: Prevents users whose nicks are not registered from creating new channels */ diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp index e487d6e30..3e7d00049 100644 --- a/src/modules/m_ripemd160.cpp +++ b/src/modules/m_ripemd160.cpp @@ -64,7 +64,7 @@ #ifdef HAS_STDINT #include <stdint.h> #endif -#include "hash.h" +#include "modules/hash.h" #define RMDsize 160 diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 2e94df042..c4439cbfb 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -23,7 +23,7 @@ /* $ModDesc: RLINE: Regexp user banning. */ #include "inspircd.h" -#include "m_regex.h" +#include "modules/regex.h" #include "xline.h" static bool ZlineOnMatch = false; diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index ff007f799..e949e3fd4 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -19,10 +19,10 @@ #include "inspircd.h" -#include "m_cap.h" -#include "account.h" -#include "sasl.h" -#include "ssl.h" +#include "modules/cap.h" +#include "modules/account.h" +#include "modules/sasl.h" +#include "modules/ssl.h" /* $ModDesc: Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE. */ diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index fbf099924..bdd47b4bc 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -25,7 +25,7 @@ /* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */ #include "inspircd.h" -#include "account.h" +#include "modules/account.h" /** Channel mode +r - mark a channel as identified */ diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index 360b18ddd..2c53e7170 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -62,7 +62,7 @@ #ifdef HAS_STDINT #include <stdint.h> #endif -#include "hash.h" +#include "modules/hash.h" #ifndef HAS_STDINT typedef unsigned int uint32_t; diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h index bad1b7419..da9911170 100644 --- a/src/modules/m_spanningtree/cachetimer.h +++ b/src/modules/m_spanningtree/cachetimer.h @@ -17,8 +17,7 @@ */ -#ifndef M_SPANNINGTREE_CACHETIMER_H -#define M_SPANNINGTREE_CACHETIMER_H +#pragma once #include "timer.h" @@ -37,5 +36,3 @@ class CacheRefreshTimer : public Timer CacheRefreshTimer(SpanningTreeUtilities* Util); virtual void Tick(time_t TIME); }; - -#endif diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 3b5b499c1..93455c8c4 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -17,8 +17,7 @@ */ -#ifndef M_SPANNINGTREE_COMMANDS_H -#define M_SPANNINGTREE_COMMANDS_H +#pragma once #include "main.h" @@ -151,5 +150,3 @@ class SpanningTreeCommands CommandFName fname; SpanningTreeCommands(ModuleSpanningTree* module); }; - -#endif diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp index 8dc18cbbd..ec39fb746 100644 --- a/src/modules/m_spanningtree/hmac.cpp +++ b/src/modules/m_spanningtree/hmac.cpp @@ -21,8 +21,8 @@ #include "inspircd.h" #include "socket.h" #include "xline.h" -#include "../hash.h" -#include "../ssl.h" +#include "modules/hash.h" +#include "modules/ssl.h" #include "socketengine.h" #include "main.h" diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h index 797f108d8..b318c9bf2 100644 --- a/src/modules/m_spanningtree/link.h +++ b/src/modules/m_spanningtree/link.h @@ -18,8 +18,7 @@ */ -#ifndef M_SPANNINGTREE_LINK_H -#define M_SPANNINGTREE_LINK_H +#pragma once class Link : public refcountbase { @@ -51,5 +50,3 @@ class Autoconnect : public refcountbase int position; Autoconnect(ConfigTag* Tag) : tag(Tag) {} }; - -#endif diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 1a16d72bb..fc59a3c7d 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -21,8 +21,7 @@ */ -#ifndef M_SPANNINGTREE_MAIN_H -#define M_SPANNINGTREE_MAIN_H +#pragma once #include "inspircd.h" #include <stdarg.h> @@ -178,5 +177,3 @@ class ModuleSpanningTree : public Module Version GetVersion(); void Prioritize(); }; - -#endif diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp index af2e04ebc..235f74781 100644 --- a/src/modules/m_spanningtree/operquit.cpp +++ b/src/modules/m_spanningtree/operquit.cpp @@ -19,7 +19,6 @@ #include "inspircd.h" #include "xline.h" - #include "treesocket.h" #include "treeserver.h" #include "utils.h" diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index 297366893..2757db8da 100644 --- a/src/modules/m_spanningtree/protocolinterface.h +++ b/src/modules/m_spanningtree/protocolinterface.h @@ -17,8 +17,7 @@ */ -#ifndef M_SPANNINGTREE_PROTOCOLINTERFACE_H -#define M_SPANNINGTREE_PROTOCOLINTERFACE_H +#pragma once class SpanningTreeUtilities; class ModuleSpanningTree; @@ -43,6 +42,3 @@ class SpanningTreeProtocolInterface : public ProtocolInterface virtual void SendUserNotice(User* target, const std::string &text); virtual void GetServerList(ProtoServerList &sl); }; - -#endif - diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 65b9e7249..a092e156b 100644 --- a/src/modules/m_spanningtree/resolvers.h +++ b/src/modules/m_spanningtree/resolvers.h @@ -18,8 +18,7 @@ */ -#ifndef M_SPANNINGTREE_RESOLVERS_H -#define M_SPANNINGTREE_RESOLVERS_H +#pragma once #include "socket.h" #include "inspircd.h" @@ -63,5 +62,3 @@ class ServernameResolver : public Resolver void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached); void OnError(ResolverError e, const std::string &errormessage); }; - -#endif diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 6213483ee..42cd37fb9 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -24,7 +24,7 @@ #include "socket.h" #include "xline.h" #include "main.h" -#include "../spanningtree.h" +#include "modules/spanningtree.h" #include "utils.h" #include "treeserver.h" diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 60b6d1def..f5d81bc73 100644 --- a/src/modules/m_spanningtree/treeserver.h +++ b/src/modules/m_spanningtree/treeserver.h @@ -19,8 +19,7 @@ */ -#ifndef M_SPANNINGTREE_TREESERVER_H -#define M_SPANNINGTREE_TREESERVER_H +#pragma once #include "treesocket.h" @@ -210,5 +209,3 @@ class TreeServer : public classbase */ ~TreeServer(); }; - -#endif diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 85d256c61..2d975a4bf 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -20,8 +20,7 @@ */ -#ifndef M_SPANNINGTREE_TREESOCKET_H -#define M_SPANNINGTREE_TREESOCKET_H +#pragma once #include "socket.h" #include "inspircd.h" @@ -318,6 +317,3 @@ class TreeSocket : public BufferedSocket */ bool Introduced(); }; - -#endif - diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 26171ee72..6a528ed8d 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -26,7 +26,7 @@ #include "socketengine.h" #include "main.h" -#include "../spanningtree.h" +#include "modules/spanningtree.h" #include "utils.h" #include "treeserver.h" #include "link.h" diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index 0d44cd24f..fed90c253 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -20,8 +20,7 @@ */ -#ifndef M_SPANNINGTREE_UTILS_H -#define M_SPANNINGTREE_UTILS_H +#pragma once #include "inspircd.h" @@ -179,5 +178,3 @@ class SpanningTreeUtilities : public classbase */ void RefreshIPCache(); }; - -#endif diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index 8647e3e9e..e92eea3a5 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -18,8 +18,8 @@ #include "inspircd.h" -#include "sql.h" -#include "hash.h" +#include "modules/sql.h" +#include "modules/hash.h" /* $ModDesc: Allow/Deny connections based upon an arbitrary SQL table */ diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp index 881b8d6d2..b5b020d9d 100644 --- a/src/modules/m_sqloper.cpp +++ b/src/modules/m_sqloper.cpp @@ -18,8 +18,8 @@ #include "inspircd.h" -#include "sql.h" -#include "hash.h" +#include "modules/sql.h" +#include "modules/hash.h" /* $ModDesc: Allows storage of oper credentials in an SQL table */ diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index a04a643a0..b51c30b76 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -18,7 +18,7 @@ #include "inspircd.h" -#include "ssl.h" +#include "modules/ssl.h" /* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */ diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index fbd77c249..d862a0706 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -22,7 +22,7 @@ #include "inspircd.h" -#include "ssl.h" +#include "modules/ssl.h" /* $ModDesc: Provides channel mode +z to allow for Secure/SSL only channels */ diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp index 1b0c91c94..a0ff796ae 100644 --- a/src/modules/m_uhnames.cpp +++ b/src/modules/m_uhnames.cpp @@ -20,7 +20,7 @@ #include "inspircd.h" -#include "m_cap.h" +#include "modules/cap.h" /* $ModDesc: Provides the UHNAMES facility. */ diff --git a/win/config.h.cmake b/win/config.h.cmake index 47cdb9f65..05c3ce2f9 100644 --- a/win/config.h.cmake +++ b/win/config.h.cmake @@ -1,5 +1,4 @@ -#ifndef INSPIRCD_CONFIG_H
-#define INSPIRCD_CONFIG_H
+#pragma once
#define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"
#define VERSION "@FULL_VERSION@"
@@ -14,5 +13,3 @@ #include "inspircd_win32wrapper.h"
#include "threadengines/threadengine_win32.h"
-
-#endif
\ No newline at end of file diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index 398708317..2093bf3a8 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #include <windows.h> #include <exception> #include <new> diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index ebc498529..7a07868f9 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #include "inspircd_win32wrapper.h" #include "inspircd.h" #include "configreader.h" @@ -203,7 +204,7 @@ DWORD CWin32Exception::GetErrorCode() } #include "../src/modules/m_spanningtree/link.h" -#include "../src/modules/ssl.h" +#include "modules/ssl.h" template class reference<Link>; template class reference<Autoconnect>; template class reference<ssl_cert>; diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 75404ef8b..9b18715cd 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -19,13 +19,11 @@ */ +#pragma once + /* Windows Port Wrapper Functions/Definitions By Burlex */ - -#ifndef INSPIRCD_WIN32WRAPPER_H -#define INSPIRCD_WIN32WRAPPER_H - /* * Starting with PSAPI version 2 for Windows 7 and Windows Server 2008 R2, this function is defined as K32GetProcessMemoryInfo in Psapi.h and exported * in Kernel32.lib and Kernel32.dll. However, you should always call this function as GetProcessMemoryInfo. To ensure correct resolution of symbols @@ -200,6 +198,3 @@ private: char szErrorString[500]; DWORD dwErrorCode; }; - -#endif - diff --git a/win/win32service.h b/win/win32service.h index e4500be13..d8177eabc 100644 --- a/win/win32service.h +++ b/win/win32service.h @@ -15,7 +15,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #pragma once + #ifdef _WIN32 /* Hook for win32service.cpp to exit properly with the service specific error code */ |