summaryrefslogtreecommitdiff
path: root/commonheaders.h
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-10-08 07:01:44 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-10-08 07:01:44 +0300
commitd5721b974a58ed5a26f33346dae728d93a7c1803 (patch)
tree2679ec39d8a44b5c3bdaf947d21881135460e7b7 /commonheaders.h
parent7df7cc0f3a8435c18e4491b04827deb47078b6d5 (diff)
boost threads and mutexes, better error handling (thread's timeouts)
Diffstat (limited to 'commonheaders.h')
-rw-r--r--commonheaders.h22
1 files changed, 15 insertions, 7 deletions
diff --git a/commonheaders.h b/commonheaders.h
index d76cc58..49a1b4d 100644
--- a/commonheaders.h
+++ b/commonheaders.h
@@ -16,15 +16,17 @@
#ifndef COMMONHEADERS_H
#define COMMONHEADERS_H
#define MIRANDA_VER 0x0901
+//windows
#include <windows.h>
-#include <locale.h>
#include <shlobj.h>
#include <io.h>
-#include <errno.h>
-#include <time.h>
#include <uxtheme.h>
#include <shlwapi.h>
-
+//c
+#include <locale.h>
+#include <errno.h>
+#include <time.h>
+//c++
#include <iostream>
#include <map>
using std::map;
@@ -39,6 +41,11 @@ using std::wstring;
using std::wfstream;
using std::fstream;
+//boost
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+
+//miranda
#include <newpluginapi.h>
#include <m_database.h>
#include <m_options.h>
@@ -58,13 +65,14 @@ using std::fstream;
#include "m_metacontacts.h"
#include "resource.h"
+
+//internal
#include "constants.h"
-#include "utilities.h"
+#include "log.h"
#include "globals.h"
+#include "utilities.h"
#include "main.h"
#include "gpg_wrapper.h"
#include "jabber_account.h"
#include "metacontacts.h"
-#include "log.h"
-extern logtofile debuglog;
#endif