Merge pull request #1084 from SaberUK/insp20+fix-parallel-debug-install

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index b61ef8031a1432e0edfe8fb1c43e9659991edd7f..e2eaf82927171fd7b8cec3bb9bc23cb3987caa7b 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -47,6 +47,7 @@
 #endif
 
 // Required system headers.
+#include <csignal>
 #include <ctime>
 #include <cstdarg>
 #include <algorithm>
@@ -169,7 +170,7 @@ inline std::string ConvToStr(const bool in)
  */
 inline std::string ConvToStr(char in)
 {
-       return std::string(in,1);
+       return std::string(1, in);
 }
 
 /** Template function to convert any input type to std::string
@@ -454,7 +455,7 @@ class CoreExport InspIRCd
 
        /** Set to the current signal recieved
         */
-       int s_signal;
+       static sig_atomic_t s_signal;
 
        /** Protocol interface, overridden by server protocol modules
         */
@@ -705,9 +706,9 @@ class CoreExport InspIRCd
         * @return True i the mask is valid
         */
        bool IsValidMask(const std::string &mask);
-       
+
        /** Strips all color codes from the given string
-        * @para sentence The string to strip from
+        * @param sentence The string to strip from
         */
        static void StripColor(std::string &sentence);