X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fglobal.h;h=05d90fc503d6958229239b6d25a65986b52c510a;hb=f8c0410b12183ecb40aafbb44086fa146b25b528;hp=3e26f37d64e9599fe5844001d4b1dfe2a740fd19;hpb=befd91205eff729a182f66de15374a577a8718f7;p=fms.git

diff --git a/include/global.h b/include/global.h
index 3e26f37..05d90fc 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.15"
+#define VERSION_MAJOR		"0"
+#define VERSION_MINOR		"3"
+#define VERSION_RELEASE		"15"
+#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_