version 0.3.33

[fms.git] / include / global.h

diff --git a/include/global.h b/include/global.h
index ba2e84f..35833ca 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -1,25 +1,19 @@
 #ifndef _global_\r
 #define _global_\r
 \r
-#include <vector>\r
-//#include <zthread/Thread.h>\r
-#include "pthreadwrapper/thread.h"\r
+#include <string>\r
+#include <Poco/ScopedLock.h>\r
+#include <Poco/Mutex.h>\r
 \r
-#define FMS_VERSION    "0.1.7"\r
+#define VERSION_MAJOR          "0"\r
+#define VERSION_MINOR          "3"\r
+#define VERSION_RELEASE                "33"\r
+#define FMS_VERSION                    VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE\r
+#define FMS_FREESITE_USK       "USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/95/"\r
+#define FMS_VERSION_EDITION    "35"\r
 \r
-// opens database and creates tables and initial inserts if necessary\r
-void SetupDB();\r
-// inserts default options into the database\r
-void SetupDefaultOptions();\r
-// opens logfile and sets it up\r
-void SetupLogFile();\r
+typedef Poco::ScopedLock<Poco::FastMutex> Guard;\r
 \r
-void StartThreads(std::vector<PThread::Thread *> &threads);\r
-void ShutdownThreads(std::vector<PThread::Thread *> &threads);\r
-\r
-// needed for Windows to setup network\r
-void SetupNetwork();\r
-// cleanup network on Windows\r
-void ShutdownNetwork();\r
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);\r
 \r
 #endif // _global_\r