From 877099559dbae2a0a2f93e122bb41f2b12cbe861 Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Thu, 8 Feb 2007 09:19:19 +0000
Subject: [PATCH] Renamed convar.h to convar_smm.h in order to avoid potential
 compiling problems with the order of include directories.

--HG--
rename : sourcemm/convar.h => sourcemm/convar_smm.h
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40330
---
 sourcemm/CPlugin.h                  | 2 +-
 sourcemm/CSmmAPI.cpp                | 1 +
 sourcemm/ISmmAPI.h                  | 1 -
 sourcemm/concommands.h              | 2 +-
 sourcemm/{convar.h => convar_smm.h} | 0
 sourcemm/msvc7/sourcemm.vcproj      | 2 +-
 sourcemm/msvc8/sourcemm.vcproj      | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename sourcemm/{convar.h => convar_smm.h} (100%)

diff --git a/sourcemm/CPlugin.h b/sourcemm/CPlugin.h
index e70806c..91e35e0 100644
--- a/sourcemm/CPlugin.h
+++ b/sourcemm/CPlugin.h
@@ -18,7 +18,7 @@
 
 #include <interface.h>
 #include <eiface.h>
-#include <convar.h>
+#include "convar_smm.h"
 #include "IPluginManager.h"
 #include "oslink.h"
 #include "sh_list.h"
diff --git a/sourcemm/CSmmAPI.cpp b/sourcemm/CSmmAPI.cpp
index b4fa52d..4b38d01 100644
--- a/sourcemm/CSmmAPI.cpp
+++ b/sourcemm/CSmmAPI.cpp
@@ -8,6 +8,7 @@
 * ============================
 */
 
+#include "convar_smm.h"
 #include "CSmmAPI.h"
 #include "sourcemm.h"
 #include "concommands.h"
diff --git a/sourcemm/ISmmAPI.h b/sourcemm/ISmmAPI.h
index a017673..b622207 100644
--- a/sourcemm/ISmmAPI.h
+++ b/sourcemm/ISmmAPI.h
@@ -18,7 +18,6 @@
 
 #include <interface.h>
 #include <eiface.h>
-#include <convar.h>
 #include <sourcehook/sourcehook.h>
 #include "IPluginManager.h"
 
diff --git a/sourcemm/concommands.h b/sourcemm/concommands.h
index 40f5859..b2a635f 100644
--- a/sourcemm/concommands.h
+++ b/sourcemm/concommands.h
@@ -19,7 +19,7 @@
 #include <interface.h>
 #include <eiface.h>
 #include "sourcemm.h"
-#include <convar.h>
+#include "convar_smm.h"
 #include "sh_list.h"
 
 class SMConVarAccessor : public IConCommandBaseAccessor
diff --git a/sourcemm/convar.h b/sourcemm/convar_smm.h
similarity index 100%
rename from sourcemm/convar.h
rename to sourcemm/convar_smm.h
diff --git a/sourcemm/msvc7/sourcemm.vcproj b/sourcemm/msvc7/sourcemm.vcproj
index cabdce2..c68f4c6 100644
--- a/sourcemm/msvc7/sourcemm.vcproj
+++ b/sourcemm/msvc7/sourcemm.vcproj
@@ -243,7 +243,7 @@
 			Name="HL2SDK"
 			Filter="">
 			<File
-				RelativePath="..\convar.h">
+				RelativePath="..\convar_smm.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/sourcemm/msvc8/sourcemm.vcproj b/sourcemm/msvc8/sourcemm.vcproj
index 2292db1..3c22b76 100644
--- a/sourcemm/msvc8/sourcemm.vcproj
+++ b/sourcemm/msvc8/sourcemm.vcproj
@@ -338,7 +338,7 @@
 			Name="HL2SDK"
 			>
 			<File
-				RelativePath="..\convar.h"
+				RelativePath="..\convar_smm.h"
 				>
 			</File>
 		</Filter>