X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fglobal.h;h=7dcc373f3da50c229ca9915b71f86ec5c73e0007;hb=14fff12d9df0ee30e2df4bf9d22c2e83065816df;hp=ddd6fa3014a0a3859c2c4d03a06b57278f1cd1dc;hpb=1dee4e3cd008a27789bbce05b0eb47b0eb5d121a;p=fms.git

diff --git a/include/global.h b/include/global.h
index ddd6fa3..7dcc373 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,22 +1,30 @@
 #ifndef _global_
 #define _global_
 
+#include <string>
 #include <vector>
-//#include <zthread/Thread.h>
 #include "pthreadwrapper/thread.h"
 
-#define FMS_VERSION	"0.2.1"
+#define FMS_VERSION	"0.2.14"
 
 // opens database and creates tables and initial inserts if necessary
 void SetupDB();
 void ConvertDB0100To0101();
 void ConvertDB0101To0103();
 void ConvertDB0103To0104();
+void ConvertDB0104To0105();
+void ConvertDB0105To0106();
+void ConvertDB0106To0107();
+void ConvertDB0107To0108();
+void ConvertDB0108To0109();
+void ConvertDB0109To0110();
 // inserts default options into the database
 void SetupDefaultOptions();
 // opens logfile and sets it up
 void SetupLogFile();
 
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey);
+
 // TODO remove sometime after 0.1.17
 void FixCapitalBoardNames();
 
@@ -25,14 +33,11 @@ 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;
+extern volatile bool wantshutdown;
 
 #endif	// _global_