summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2012-04-27 16:05:49 -0400
committerAdam <Adam@anope.org>2012-04-27 16:05:49 -0400
commite490a5461fa6ffa0b8a727833d6fcb79eef0405a (patch)
treee2f2cf9860e69bab515e52ef01182fb453dd19cc /src
parent5068483cb917ba1c8ed3a0d20f7bfcb996f0aa3e (diff)
Process defines even before includes, fixes defining{} pseudoclient names to something else in their respective configurations
Diffstat (limited to 'src')
-rw-r--r--src/config.cpp10
1 files changed, 5 insertions, 5 deletions
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", "", ""},