X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fglobal.h;h=f07da9c9edcf31b0037988c30b5e500393e503f4;hb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;hp=6258372d0f5e12860869709d0684ff27ee3ca180;hpb=52581afffd81f5a71c129d87e3ac822d9522f12d;p=fms.git

diff --git a/include/global.h b/include/global.h
index 6258372..f07da9c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,42 +2,18 @@
 #define _global_
 
 #include <string>
-#include <vector>
-#include "pthreadwrapper/thread.h"
+#include <Poco/ScopedLock.h>
+#include <Poco/Mutex.h>
 
-#define FMS_VERSION	"0.2.12"
+#define VERSION_MAJOR		"0"
+#define VERSION_MINOR		"3"
+#define VERSION_RELEASE		"20"
+#define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
+#define FMS_FREESITE_USK	"USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/80/"
+#define FMS_VERSION_EDITION	"21"
 
-// opens database and creates tables and initial inserts if necessary
-void SetupDB();
-void ConvertDB0100To0101();
-void ConvertDB0101To0103();
-void ConvertDB0103To0104();
-void ConvertDB0104To0105();
-void ConvertDB0105To0106();
-void ConvertDB0106To0107();
-void ConvertDB0107To0108();
-void ConvertDB0108To0109();
-void ConvertDB0109To0110();
-// inserts default options into the database
-void SetupDefaultOptions();
-// opens logfile and sets it up
-void SetupLogFile();
+typedef Poco::ScopedLock<Poco::FastMutex> Guard;
 
 std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);
 
-// TODO remove sometime after 0.1.17
-void FixCapitalBoardNames();
-
-void SigHandler(int signum);
-
-void MainFunction();
-void Shutdown();
-
-// needed for Windows to setup network
-void SetupNetwork();
-// cleanup network on Windows
-void ShutdownNetwork();
-
-extern bool wantshutdown;
-
 #endif	// _global_