X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fglobals.h;h=fce5fc043d8562a2fd0f9478fb0fa0255d47401e;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=5b74aeaa1412f1f655af13cc3b92738748db7b4e;hpb=ec97c162f84a3979a0f6a1c3443366784062ac9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/globals.h b/include/globals.h
index 5b74aeaa1..fce5fc043 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -17,32 +17,14 @@
 #ifndef __WORLD_H
 #define __WORLD_H
 
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
 #include <string>
 #include <deque>
-#include "users.h"
-#include "channels.h"
+#include <map>
+#include <vector>
 
 typedef std::deque<std::string> file_cache;
-
-void WriteOpers(char* text, ...);
-void log(int level, char *text, ...);
-void Write(int sock,char *text, ...);
-void WriteServ(int sock, char* text, ...);
-void WriteFrom(int sock, userrec *user,char* text, ...);
-void WriteTo(userrec *source, userrec *dest,char *data, ...);
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...);
-int common_channels(userrec *u, userrec *u2);
-void WriteCommon(userrec *u, char* text, ...);
-void WriteCommonExcept(userrec *u, char* text, ...);
-void WriteWallOps(userrec *source, bool local_only, char* text, ...);
-int isnick(const char *n);
-userrec* Find(std::string nick);
-chanrec* FindChan(const char* chan);
-void readfile(file_cache &F, const char* fname);
+typedef std::pair< std::string, std::string > KeyVal;
+typedef std::vector< KeyVal > KeyValList;
+typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
 #endif