diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-16 12:00:52 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-16 12:00:52 +0000 |
| commit | 064d18536159e5f907f8ccfd1147281c8ec93bc4 (patch) | |
| tree | da3972a70e0bed2025422d06e62b1f5fe2490fdd /include | |
| parent | 092eb69a53d679053b8daee895a7a290a71b2e62 (diff) | |
So many inclusion loops it makes your head spin - forward declaring tons of classes to fix
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2523 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/ctables.h | 11 | ||||
| -rw-r--r-- | include/helperfuncs.h | 1 | ||||
| -rw-r--r-- | include/inspircd.h | 2 | ||||
| -rw-r--r-- | include/modules.h | 5 | ||||
| -rw-r--r-- | include/typedefs.h | 1 |
5 files changed, 13 insertions, 7 deletions
diff --git a/include/ctables.h b/include/ctables.h index 5926f3a2a..2dadca42d 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -18,12 +18,15 @@ #define __CTABLES_H__ #include "inspircd_config.h" -#include "inspircd.h" -#include "base.h" +#include <deque> + +class userrec; + +typedef void (handlerfunc) (char**, int, userrec*); /** A structure that defines a command */ -class command_t : public Extensible +class command_t { public: /** Command name @@ -49,5 +52,7 @@ class command_t : public Extensible char source[MAXBUF]; }; +typedef std::deque<command_t> command_table; + #endif diff --git a/include/helperfuncs.h b/include/helperfuncs.h index 6b804c8c7..269cd70b9 100644 --- a/include/helperfuncs.h +++ b/include/helperfuncs.h @@ -22,6 +22,7 @@ #include "ctables.h" #include "users.h" #include "channels.h" +#include "typedefs.h" #include <string> #include <deque> #include <sstream> diff --git a/include/inspircd.h b/include/inspircd.h index 4e7710714..75446aa36 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -68,7 +68,7 @@ #define IS_REMOTE(x) (x->fd < 0) #define IS_MODULE_CREATED(x) (x->fd == FD_MAGIC_NUMBER) -typedef void (handlerfunc) (char**, int, userrec*); +/*typedef void (handlerfunc) (char**, int, userrec*);*/ class serverstats { diff --git a/include/modules.h b/include/modules.h index 77f986f0d..b86576296 100644 --- a/include/modules.h +++ b/include/modules.h @@ -63,6 +63,7 @@ #include <sstream> class Server; +class ServerConfig; /** Low level definition of a FileReader classes file cache area */ @@ -100,8 +101,8 @@ typedef std::deque<userrec*> chanuserlist; #define FD_MAGIC_NUMBER -42 -extern void createcommand(char* cmd, handlerfunc f, char flags, int minparams, char* source); -extern void server_mode(char **parameters, int pcnt, userrec *user); +/*extern void createcommand(char* cmd, handlerfunc f, char flags, int minparams, char* source); +extern void server_mode(char **parameters, int pcnt, userrec *user);*/ // class Version holds the version information of a Module, returned // by Module::GetVersion (thanks RD) diff --git a/include/typedefs.h b/include/typedefs.h index 0a625b1d2..2fe74c8af 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -21,7 +21,6 @@ typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHa typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash; typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache; typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash; -typedef std::deque<command_t> command_table; typedef std::vector<std::string> servernamelist; typedef std::vector<ExtMode> ExtModeList; typedef ExtModeList::iterator ExtModeListIter; |