From e490a5461fa6ffa0b8a727833d6fcb79eef0405a Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 27 Apr 2012 16:05:49 -0400
Subject: Process defines even before includes, fixes defining{} pseudoclient
 names to something else in their respective configurations

---
 src/config.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/config.cpp b/src/config.cpp
index 24b9e13b6..51a930393 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1284,11 +1284,6 @@ ConfigItems::ConfigItems(ServerConfig *conf)
 	/* These tags can occur multiple times, and therefore they have special code to read them
 	 * which is different to the code for reading the singular tags listed above. */
 	MultiItem MultiItems[] = {
-		{"define",
-			{"name", "value", ""},
-			{"", "", ""},
-			{DT_STRING, DT_STRING},
-			InitDefine, DoDefine, DoneDefine},
 		/* Include must be first so we can pull in the extra files before processing
 		 * anything else! */
 		{"include",
@@ -1296,6 +1291,11 @@ ConfigItems::ConfigItems(ServerConfig *conf)
 			{"", "", ""},
 			{DT_STRING, DT_STRING},
 			InitInclude, DoInclude, DoneInclude},
+		{"define",
+			{"name", "value", ""},
+			{"", "", ""},
+			{DT_STRING, DT_STRING},
+			InitDefine, DoDefine, DoneDefine},
 		{"uplink",
 			{"host", "ipv6", "port", "password", ""},
 			{"", "no", "0", "", ""},
-- 
cgit