X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fglobal.h;h=1576e55d45f77bf2dd80a5eb62fcb42c702f13fd;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=cee8ab5594932bea20998d994dd97877403651e7;hpb=d8ccfe2b3944adf07d35534459cdda19d15217c8;p=fms.git

diff --git a/include/global.h b/include/global.h
index cee8ab5..1576e55 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,25 +1,14 @@
 #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.6"
+#define FMS_VERSION	"0.3.0"
 
-// 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_