From 940cae8f094e76768382edcf3cd6141ff19881af Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Wed, 25 Feb 2015 00:57:28 +0100
Subject: [PATCH] Fix reserved identifier violation in header guards (#433)

---
 include/znc/Buffer.h        | 6 +++---
 include/znc/Chan.h          | 6 +++---
 include/znc/Client.h        | 6 +++---
 include/znc/Config.h        | 6 +++---
 include/znc/ExecSock.h      | 6 +++---
 include/znc/FileUtils.h     | 6 +++---
 include/znc/HTTPSock.h      | 6 +++---
 include/znc/IRCNetwork.h    | 6 +++---
 include/znc/IRCSock.h       | 6 +++---
 include/znc/Listener.h      | 6 +++---
 include/znc/MD5.h           | 6 +++---
 include/znc/Modules.h       | 6 +++---
 include/znc/Nick.h          | 6 +++---
 include/znc/Query.h         | 6 +++---
 include/znc/SHA256.h        | 6 +++---
 include/znc/SSLVerifyHost.h | 6 +++---
 include/znc/Server.h        | 6 +++---
 include/znc/Socket.h        | 6 +++---
 include/znc/Template.h      | 6 +++---
 include/znc/Threads.h       | 6 +++---
 include/znc/User.h          | 6 +++---
 include/znc/Utils.h         | 6 +++---
 include/znc/WebModules.h    | 6 +++---
 include/znc/defines.h       | 6 +++---
 include/znc/main.h          | 6 +++---
 include/znc/version.h       | 6 +++---
 include/znc/znc.h           | 6 +++---
 27 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/include/znc/Buffer.h b/include/znc/Buffer.h
index 0c62cd01..1314b028 100644
--- a/include/znc/Buffer.h
+++ b/include/znc/Buffer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _BUFFER_H
-#define _BUFFER_H
+#ifndef ZNC_BUFFER_H
+#define ZNC_BUFFER_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -82,4 +82,4 @@ protected:
 	unsigned int m_uLineCount;
 };
 
-#endif // !_BUFFER_H
+#endif // !ZNC_BUFFER_H
diff --git a/include/znc/Chan.h b/include/znc/Chan.h
index 7794b130..1123eb6e 100644
--- a/include/znc/Chan.h
+++ b/include/znc/Chan.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _CHAN_H
-#define _CHAN_H
+#ifndef ZNC_CHAN_H
+#define ZNC_CHAN_H
 
 #include <znc/zncconfig.h>
 #include <znc/Nick.h>
@@ -180,4 +180,4 @@ protected:
 	std::map<unsigned char, CString> m_musModes;
 };
 
-#endif // !_CHAN_H
+#endif // !ZNC_CHAN_H
diff --git a/include/znc/Client.h b/include/znc/Client.h
index bb70bdd1..a4aaea8f 100644
--- a/include/znc/Client.h
+++ b/include/znc/Client.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _CLIENT_H
-#define _CLIENT_H
+#ifndef ZNC_CLIENT_H
+#define ZNC_CLIENT_H
 
 #include <znc/zncconfig.h>
 #include <znc/Socket.h>
@@ -209,4 +209,4 @@ protected:
 	friend class ClientTest;
 };
 
-#endif // !_CLIENT_H
+#endif // !ZNC_CLIENT_H
diff --git a/include/znc/Config.h b/include/znc/Config.h
index 344874b2..70f3757d 100644
--- a/include/znc/Config.h
+++ b/include/znc/Config.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef ZNC_CONFIG_H
+#define ZNC_CONFIG_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -171,4 +171,4 @@ private:
 	SubConfigMap m_SubConfigs;
 };
 
-#endif // !CONFIG_H
+#endif // !ZNC_CONFIG_H
diff --git a/include/znc/ExecSock.h b/include/znc/ExecSock.h
index 6299e0d8..476690aa 100644
--- a/include/znc/ExecSock.h
+++ b/include/znc/ExecSock.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef EXEC_SOCK_H
-#define EXEC_SOCK_H
+#ifndef ZNC_EXECSOCK_H
+#define ZNC_EXECSOCK_H
 
 #include <znc/zncconfig.h>
 #include <znc/Socket.h>
@@ -52,4 +52,4 @@ private:
 	int  m_iPid;
 };
 
-#endif // !EXEC_SOCK_H
+#endif // !ZNC_EXECSOCK_H
diff --git a/include/znc/FileUtils.h b/include/znc/FileUtils.h
index 0c401113..b16e572e 100644
--- a/include/znc/FileUtils.h
+++ b/include/znc/FileUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _FILEUTILS_H
-#define _FILEUTILS_H
+#ifndef ZNC_FILEUTILS_H
+#define ZNC_FILEUTILS_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -259,4 +259,4 @@ protected:
 	CFile::EFileAttr m_eSortAttr;
 	bool             m_bDesc;
 };
-#endif // !_FILEUTILS_H
+#endif // !ZNC_FILEUTILS_H
diff --git a/include/znc/HTTPSock.h b/include/znc/HTTPSock.h
index ed85d8b1..0f12c866 100644
--- a/include/znc/HTTPSock.h
+++ b/include/znc/HTTPSock.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _HTTPSOCK_H
-#define _HTTPSOCK_H
+#ifndef ZNC_HTTPSOCK_H
+#define ZNC_HTTPSOCK_H
 
 #include <znc/zncconfig.h>
 #include <znc/Socket.h>
@@ -125,4 +125,4 @@ protected:
 	CString                  m_sURIPrefix;
 };
 
-#endif // !_HTTPSOCK_H
+#endif // !ZNC_HTTPSOCK_H
diff --git a/include/znc/IRCNetwork.h b/include/znc/IRCNetwork.h
index 992b3121..769b89d2 100644
--- a/include/znc/IRCNetwork.h
+++ b/include/znc/IRCNetwork.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _IRCNETWORK_H
-#define _IRCNETWORK_H
+#ifndef ZNC_IRCNETWORK_H
+#define ZNC_IRCNETWORK_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -244,4 +244,4 @@ protected:
 	unsigned short int m_uJoinDelay;
 };
 
-#endif // !_IRCNETWORK_H
+#endif // !ZNC_IRCNETWORK_H
diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h
index 719e2bcd..4b3309c1 100644
--- a/include/znc/IRCSock.h
+++ b/include/znc/IRCSock.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _IRCSOCK_H
-#define _IRCSOCK_H
+#ifndef ZNC_IRCSOCK_H
+#define ZNC_IRCSOCK_H
 
 #include <znc/zncconfig.h>
 #include <znc/Socket.h>
@@ -152,4 +152,4 @@ protected:
 	friend class CIRCFloodTimer;
 };
 
-#endif // !_IRCSOCK_H
+#endif // !ZNC_IRCSOCK_H
diff --git a/include/znc/Listener.h b/include/znc/Listener.h
index 1c77051b..4a825984 100644
--- a/include/znc/Listener.h
+++ b/include/znc/Listener.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _LISTENER_H
-#define _LISTENER_H
+#ifndef ZNC_LISTENER_H
+#define ZNC_LISTENER_H
 
 #include <znc/zncconfig.h>
 #include <znc/Socket.h>
@@ -100,4 +100,4 @@ private:
 	const CString m_sURIPrefix;
 };
 
-#endif // !_LISTENER_H
+#endif // !ZNC_LISTENER_H
diff --git a/include/znc/MD5.h b/include/znc/MD5.h
index f2cde0ee..11655b40 100644
--- a/include/znc/MD5.h
+++ b/include/znc/MD5.h
@@ -1,7 +1,7 @@
 /* C implementation by Christophe Devine, C++ "class-ified" by [T3] */
 
-#ifndef _MD5_H
-#define _MD5_H
+#ifndef ZNC_MD5_H
+#define ZNC_MD5_H
 
 #include <znc/zncconfig.h>
 #include <string>
@@ -54,4 +54,4 @@ private:
 	void md5_process( md5_context *ctx, const uint8 data[64] ) const;
 };
 
-#endif /* _MD5_H */
+#endif /* ZNC_MD5_H */
diff --git a/include/znc/Modules.h b/include/znc/Modules.h
index 74275ac1..2c915367 100644
--- a/include/znc/Modules.h
+++ b/include/znc/Modules.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _MODULES_H
-#define _MODULES_H
+#ifndef ZNC_MODULES_H
+#define ZNC_MODULES_H
 
 #include <znc/zncconfig.h>
 #include <znc/WebModules.h>
@@ -1277,4 +1277,4 @@ protected:
 	CClient*      m_pClient;
 };
 
-#endif // !_MODULES_H
+#endif // !ZNC_MODULES_H
diff --git a/include/znc/Nick.h b/include/znc/Nick.h
index 6d03d55e..e4358cd5 100644
--- a/include/znc/Nick.h
+++ b/include/znc/Nick.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _NICK_H
-#define _NICK_H
+#ifndef ZNC_NICK_H
+#define ZNC_NICK_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -71,4 +71,4 @@ protected:
 	CString      m_sHost;
 };
 
-#endif // !_NICK_H
+#endif // !ZNC_NICK_H
diff --git a/include/znc/Query.h b/include/znc/Query.h
index b3f06aa9..fc4422c3 100644
--- a/include/znc/Query.h
+++ b/include/znc/Query.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _QUERY_H
-#define _QUERY_H
+#ifndef ZNC_QUERY_H
+#define ZNC_QUERY_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -51,4 +51,4 @@ private:
 	CBuffer                      m_Buffer;
 };
 
-#endif // !_QUERY_H
+#endif // !ZNC_QUERY_H
diff --git a/include/znc/SHA256.h b/include/znc/SHA256.h
index 684244a6..6184ed69 100644
--- a/include/znc/SHA256.h
+++ b/include/znc/SHA256.h
@@ -31,8 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef SHA2_H
-#define SHA2_H
+#ifndef ZNC_SHA2_H
+#define ZNC_SHA2_H
 
 #define SHA256_DIGEST_SIZE ( 256 / 8)
 #define SHA256_BLOCK_SIZE  ( 512 / 8)
@@ -60,5 +60,5 @@ void sha256_final(sha256_ctx *ctx, unsigned char *digest);
 void sha256(const unsigned char *message, size_t len,
             unsigned char *digest);
 
-#endif /* !SHA2_H */
+#endif /* !ZNC_SHA2_H */
 
diff --git a/include/znc/SSLVerifyHost.h b/include/znc/SSLVerifyHost.h
index a2385550..fe0b5952 100644
--- a/include/znc/SSLVerifyHost.h
+++ b/include/znc/SSLVerifyHost.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef SSLVERIFYHOST_H
-#define SSLVERIFYHOST_H
+#ifndef ZNC_SSLVERIFYHOST_H
+#define ZNC_SSLVERIFYHOST_H
 
 #ifdef HAVE_LIBSSL
 
@@ -26,4 +26,4 @@ bool ZNC_SSLVerifyHost(const CString& sHost, const X509* pCert, CString& sError)
 
 #endif /* HAVE_LIBSSL */
 
-#endif /* SSLVERIFYHOST_H */
+#endif /* ZNC_SSLVERIFYHOST_H */
diff --git a/include/znc/Server.h b/include/znc/Server.h
index 60782ba7..4dc28520 100644
--- a/include/znc/Server.h
+++ b/include/znc/Server.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _SERVER_H
-#define _SERVER_H
+#ifndef ZNC_SERVER_H
+#define ZNC_SERVER_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -39,4 +39,4 @@ protected:
 	bool            m_bSSL;
 };
 
-#endif // !_SERVER_H
+#endif // !ZNC_SERVER_H
diff --git a/include/znc/Socket.h b/include/znc/Socket.h
index 0d0037c7..1d63bad9 100644
--- a/include/znc/Socket.h
+++ b/include/znc/Socket.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef SOCKET_H
-#define SOCKET_H
+#ifndef ZNC_SOCKET_H
+#define ZNC_SOCKET_H
 
 #include <znc/zncconfig.h>
 #include <znc/Csocket.h>
@@ -256,4 +256,4 @@ public:
 #endif
 };
 
-#endif /* SOCKET_H */
+#endif /* ZNC_SOCKET_H */
diff --git a/include/znc/Template.h b/include/znc/Template.h
index bec1500c..2fb10287 100644
--- a/include/znc/Template.h
+++ b/include/znc/Template.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _TEMPLATE_H
-#define _TEMPLATE_H
+#ifndef ZNC_TEMPLATE_H
+#define ZNC_TEMPLATE_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -182,4 +182,4 @@ private:
 	std::vector<std::shared_ptr<CTemplateTagHandler> >  m_vspTagHandlers;
 };
 
-#endif // !_TEMPLATE_H
+#endif // !ZNC_TEMPLATE_H
diff --git a/include/znc/Threads.h b/include/znc/Threads.h
index c4e02366..8590bb25 100644
--- a/include/znc/Threads.h
+++ b/include/znc/Threads.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _THREADS_H
-#define _THREADS_H
+#ifndef ZNC_THREADS_H
+#define ZNC_THREADS_H
 
 #include <znc/zncconfig.h>
 
@@ -327,4 +327,4 @@ private:
 };
 
 #endif // HAVE_PTHREAD
-#endif // !_THREADS_H
+#endif // !ZNC_THREADS_H
diff --git a/include/znc/User.h b/include/znc/User.h
index 2fd3678a..af5f76a4 100644
--- a/include/znc/User.h
+++ b/include/znc/User.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _USER_H
-#define _USER_H
+#ifndef ZNC_USER_H
+#define ZNC_USER_H
 
 #include <znc/zncconfig.h>
 #include <znc/Utils.h>
@@ -244,4 +244,4 @@ private:
 	bool LoadModule(const CString& sModName, const CString& sArgs, const CString& sNotice, CString& sError);
 };
 
-#endif // !_USER_H
+#endif // !ZNC_USER_H
diff --git a/include/znc/Utils.h b/include/znc/Utils.h
index 6db05aa4..a0b4cf8b 100644
--- a/include/znc/Utils.h
+++ b/include/znc/Utils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef ZNC_UTILS_H
+#define ZNC_UTILS_H
 
 #include <znc/zncconfig.h>
 #include <znc/ZNCString.h>
@@ -363,4 +363,4 @@ protected:
 	unsigned int         m_uTTL;     //!< Default time-to-live duration
 };
 
-#endif // !_UTILS_H
+#endif // !ZNC_UTILS_H
diff --git a/include/znc/WebModules.h b/include/znc/WebModules.h
index 554ab597..6c2c601b 100644
--- a/include/znc/WebModules.h
+++ b/include/znc/WebModules.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _WEBMODULES_H
-#define _WEBMODULES_H
+#ifndef ZNC_WEBMODULES_H
+#define ZNC_WEBMODULES_H
 
 #include <znc/zncconfig.h>
 #include <znc/Template.h>
@@ -168,4 +168,4 @@ private:
 	static const unsigned int m_uiMaxSessions;
 };
 
-#endif // !_WEBMODULES_H
+#endif // !ZNC_WEBMODULES_H
diff --git a/include/znc/defines.h b/include/znc/defines.h
index 216aa219..ebe6b92f 100644
--- a/include/znc/defines.h
+++ b/include/znc/defines.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _DEFINES_H
-#define _DEFINES_H
+#ifndef ZNC_DEFINES_H
+#define ZNC_DEFINES_H
 
 #include <znc/zncconfig.h>
 
@@ -36,4 +36,4 @@
 #define PERROR(f)    DEBUG(__FILE__ << ":" << __LINE__ << " " << f << ": " << strerror(GetSockError()))
 
 
-#endif // !_DEFINES_H
+#endif // !ZNC_DEFINES_H
diff --git a/include/znc/main.h b/include/znc/main.h
index db173d5e..3dccdbb9 100644
--- a/include/znc/main.h
+++ b/include/znc/main.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _MAIN_H
-#define _MAIN_H
+#ifndef ZNC_MAIN_H
+#define ZNC_MAIN_H
 
 #include <znc/zncconfig.h>
 #include <znc/version.h>
@@ -142,4 +142,4 @@ extern bool ZNC_NO_NEED_TO_DO_ANYTHING_ON_MODULE_CALL_EXITER;
  *  Feel free to also look at existing modules.
  */
 
-#endif // !_MAIN_H
+#endif // !ZNC_MAIN_H
diff --git a/include/znc/version.h b/include/znc/version.h
index 3567db92..360280ea 100644
--- a/include/znc/version.h
+++ b/include/znc/version.h
@@ -1,5 +1,5 @@
-#ifndef _VERSION_H
-#define _VERSION_H
+#ifndef ZNC_VERSION_H
+#define ZNC_VERSION_H
 
 // The following defines are for #if comparison (preprocessor only likes ints)
 #define VERSION_MAJOR  1
@@ -13,4 +13,4 @@
 // You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
 extern const char* ZNC_VERSION_EXTRA;
 
-#endif
+#endif // !ZNC_VERSION_H
diff --git a/include/znc/znc.h b/include/znc/znc.h
index 05fad412..e7e2872f 100644
--- a/include/znc/znc.h
+++ b/include/znc/znc.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _ZNC_H
-#define _ZNC_H
+#ifndef ZNC_H
+#define ZNC_H
 
 #include <znc/zncconfig.h>
 #include <znc/Client.h>
@@ -237,4 +237,4 @@ protected:
 	bool                   m_bHideVersion;
 };
 
-#endif // !_ZNC_H
+#endif // !ZNC_H