diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/config.h.cmake | 5 | ||||
-rw-r--r-- | win/inspircd_memory_functions.cpp | 1 | ||||
-rw-r--r-- | win/inspircd_win32wrapper.cpp | 3 | ||||
-rw-r--r-- | win/inspircd_win32wrapper.h | 9 | ||||
-rw-r--r-- | win/win32service.h | 2 |
5 files changed, 8 insertions, 12 deletions
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 */ |