X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=include%2Fglobal.h;h=204aa4544c9438cbb3b45c6bf00b010df245bd86;hp=55a1e63ad51f038e8cff95bedd84cfce46b7e791;hb=026dc6b2bc548c945359c4e166eff514f2c47c6a;hpb=4430e7762844c66428b6f822288beb71b7f82b95

diff --git a/include/global.h b/include/global.h
index 55a1e63..204aa45 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,35 +1,17 @@
 #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.14"
+#define VERSION_MAJOR		"0"
+#define VERSION_MINOR		"3"
+#define VERSION_RELEASE		"6"
+#define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
 
-// opens database and creates tables and initial inserts if necessary
-void SetupDB();
-void ConvertDB0100To0101();
-void ConvertDB0101To0103();
-void ConvertDB0103To0104();
-// inserts default options into the database
-void SetupDefaultOptions();
-// opens logfile and sets it up
-void SetupLogFile();
+typedef Poco::ScopedLock<Poco::FastMutex> Guard;
 
-void SigHandler(int signum);
-
-void MainFunction();
-void Shutdown();
-
-//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();
-
-extern bool wantshutdown;
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);
 
 #endif	// _global_