diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-26 19:18:26 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-26 19:18:26 +0000 |
| commit | 9ce18436e94c2cdebeba90eba30b3c3e1ca311ed (patch) | |
| tree | 1e4ae4080759edadfde9ae232f7c465e326a230c /include | |
| parent | a6e0557f91998c30469030f08464cc8cb6c11fd6 (diff) | |
Revert configure so that we can uh, actually compile.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9037 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/configreader.h b/include/configreader.h index 3d889f943..d7789b9ed 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -231,10 +231,6 @@ class CoreExport ServerConfig : public Extensible * and setting error if an error has occured. */ bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream); - - /** Process an include directive - */ - bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); /** Check that there is only one of each configuration item */ @@ -242,6 +238,14 @@ class CoreExport ServerConfig : public Extensible public: + /** Process an include executable directive + */ + bool DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); + + /** Process an include file directive + */ + bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); + User* RehashUser; std::string RehashParameter; @@ -679,12 +683,12 @@ class CoreExport ServerConfig : public Extensible /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream); + bool LoadConf(ConfigDataHash &target, FILE* &conf, const char* filename, std::ostringstream &errorstream); /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream); + bool LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream); /* Both these return true if the value existed or false otherwise */ |