X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=include%2Fglobal.h;h=4fc4ad545673ec1d95a6315f34706d287a156249;hp=ba827c41552867ad87406bde3028bc0d3caf2c10;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa

diff --git a/include/global.h b/include/global.h
index ba827c4..4fc4ad5 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,25 +1,19 @@
 #ifndef _global_
 #define _global_
 
-#include <vector>
-//#include <zthread/Thread.h>
-#include "pthreadwrapper/thread.h"
+#include <string>
+#include <Poco/ScopedLock.h>
+#include <Poco/Mutex.h>
 
-#define FMS_VERSION	"0.1.9"
+#define VERSION_MAJOR		"0"
+#define VERSION_MINOR		"3"
+#define VERSION_RELEASE		"29"
+#define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
+#define FMS_FREESITE_USK	"USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/91/"
+#define FMS_VERSION_EDITION	"31"
 
-// 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<PThread::Thread *> &threads);
-void ShutdownThreads(std::vector<PThread::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_