X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fglobal.h;h=6dd1730fc685ef31bc4711b146989ac053cdac19;hb=278ee758050cb7772cd95946688c5b40104f4d8b;hp=b823d73357d2242bd78030848ef6a98504a34c4c;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/include/global.h b/include/global.h
index b823d73..6dd1730 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,24 +1,19 @@
 #ifndef _global_
 #define _global_
 
-#include <vector>
-#include <zthread/Thread.h>
+#include <string>
+#include <Poco/ScopedLock.h>
+#include <Poco/Mutex.h>
 
-#define FMS_VERSION	"0.1.0"
+#define VERSION_MAJOR		"0"
+#define VERSION_MINOR		"3"
+#define VERSION_RELEASE		"19"
+#define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
+#define FMS_FREESITE_USK	"USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/79/"
+#define FMS_VERSION_EDITION	"20"
 
-// opens database and creates tables and initial inserts if necessary
-void SetupDB();
-// inserts default options into the database
-void SetupDefaultOptions();
-// opens logfile and sets it up
-void SetupLogFile();
+typedef Poco::ScopedLock<Poco::FastMutex> Guard;
 
-void StartThreads(std::vector<ZThread::Thread *> &threads);
-void ShutdownThreads(std::vector<ZThread::Thread *> &threads);
-
-// needed for Windows to setup network
-void SetupNetwork();
-// cleanup network on Windows
-void ShutdownNetwork();
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);
 
 #endif	// _global_