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

diff --git a/include/global.h b/include/global.h
index 0c1be3b..4fc4ad5 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,36 +1,19 @@
 #ifndef _global_
 #define _global_
 
-#include <vector>
-#include "pthreadwrapper/thread.h"
+#include <string>
+#include <Poco/ScopedLock.h>
+#include <Poco/Mutex.h>
 
-#define FMS_VERSION	"0.2.4"
+#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();
-void ConvertDB0100To0101();
-void ConvertDB0101To0103();
-void ConvertDB0103To0104();
-void ConvertDB0104To0105();
-void ConvertDB0105To0106();
-// inserts default options into the database
-void SetupDefaultOptions();
-// opens logfile and sets it up
-void SetupLogFile();
+typedef Poco::ScopedLock<Poco::FastMutex> Guard;
 
-// 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;
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);
 
 #endif	// _global_