From 82bf46fa061a4f18071e73756e4e0d618eb57320 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 13 May 2008 15:53:12 +0000
Subject: [PATCH] Microsoft, in their "infinite wisdom" decide to have no
 sensible naming convention at all for windows api structs so have taken the
 struct name 'ACL' in winnt.h. Therefore we have to rename ours to HTTPACL :(

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9720 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_httpd_acl.cpp | 12 ++++++------
 win/inspircdVC80.vcproj     | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index e29c50c31..685eae5c6 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -19,7 +19,7 @@
 /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
 /* $ModDep: httpd.h */
 
-class ACL : public Extensible
+class HTTPACL : public Extensible
 {
  public:
 	std::string path;
@@ -28,12 +28,12 @@ class ACL : public Extensible
 	std::string whitelist;
 	std::string blacklist;
 
-	ACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
+	HTTPACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
 		const std::string &set_whitelist, const std::string &set_blacklist)
 		: path(set_path), username(set_username), password(set_password), whitelist(set_whitelist),
 		blacklist(set_blacklist) { }
 
-	~ACL() { }
+	~HTTPACL() { }
 };
 
 class ModuleHTTPAccessList : public Module
@@ -41,7 +41,7 @@ class ModuleHTTPAccessList : public Module
 	
 	std::string stylesheet;
 	bool changed;
-	std::vector<ACL> acl_list;
+	std::vector<HTTPACL> acl_list;
 
  public:
 
@@ -85,7 +85,7 @@ class ModuleHTTPAccessList : public Module
 			ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Read ACL: path=%s pass=%s whitelist=%s blacklist=%s", path.c_str(),
 					password.c_str(), whitelist.c_str(), blacklist.c_str());
 
-			acl_list.push_back(ACL(path, username, password, whitelist, blacklist));
+			acl_list.push_back(HTTPACL(path, username, password, whitelist, blacklist));
 		}
 	}
 
@@ -171,7 +171,7 @@ class ModuleHTTPAccessList : public Module
 			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd acl event");
 			HTTPRequest* http = (HTTPRequest*)event->GetData();
 
-			for (std::vector<ACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
+			for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
 			{
 				if (match(http->GetURI(), this_acl->path))
 				{
diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 3c58a2b46..3e83cbb26 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -1793,6 +1793,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_httpd_acl.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_httpd_stats.cpp"
 				>
-- 
2.39.2