From 09afa5085614e0224a296abd082fce205003c3fe Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 9 Aug 2006 11:33:10 +0000
Subject: ServerConfig extern moved into class InspIRCd

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4808 e03df62e-2008-0410-955e-edbf42e46eb7
---
 include/inspircd.h | 1 +
 include/modules.h  | 8 ++++----
 include/typedefs.h | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/inspircd.h b/include/inspircd.h
index 0ebad50a8..0b2a2830d 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -103,6 +103,7 @@ class InspIRCd : public classbase
 	CommandParser* Parser;
 	SocketEngine* SE;
 	serverstats* stats;
+	ServerConfig* Config;
 	DNS* Res;
 
 	std::string GetRevision();
diff --git a/include/modules.h b/include/modules.h
index f35aef0b0..f687c9ffe 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -93,9 +93,9 @@ typedef std::map<std::string,Module*> featurelist;
  * loaded modules in a readable simple way, e.g.:
  * 'FOREACH_MOD(I_OnXonnwxr,OnConnect(user));'
  */
-#define FOREACH_MOD(y,x) if (Config->global_implementation[y] > 0) { \
+#define FOREACH_MOD(y,x) if (ServerInstance->Config->global_implementation[y] > 0) { \
 	for (int _i = 0; _i <= MODCOUNT; _i++) { \
-	if (Config->implement_lists[_i][y]) \
+	if (ServerInstance->Config->implement_lists[_i][y]) \
 		try \
 		{ \
 			modules[_i]->x ; \
@@ -112,10 +112,10 @@ typedef std::map<std::string,Module*> featurelist;
  * The first module to return a nonzero result is the value to be accepted,
  * and any modules after are ignored.
  */
-#define FOREACH_RESULT(y,x) { if (Config->global_implementation[y] > 0) { \
+#define FOREACH_RESULT(y,x) { if (ServerInstance->Config->global_implementation[y] > 0) { \
 			MOD_RESULT = 0; \
 			for (int _i = 0; _i <= MODCOUNT; _i++) { \
-			if (Config->implement_lists[_i][y]) {\
+			if (ServerInstance->Config->implement_lists[_i][y]) {\
 				try \
 				{ \
 					int res = modules[_i]->x ; \
diff --git a/include/typedefs.h b/include/typedefs.h
index 4b6d22b98..fc99fd435 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -9,7 +9,6 @@
 #include "hashcomp.h"
 #include "inspstring.h"
 #include "ctables.h"
-#include "inspircd.h"
 #include "modules.h"
 #include "globals.h"
 
-- 
cgit v1.2.3