diff options
author | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
commit | 0e854af70f6f330e63aa36fde125fbb0ca4ff8ef (patch) | |
tree | d681b5e06a8c572c13d82d0b49b54860fb896843 /protocols/Tox | |
parent | d60f86e09f10ab4d55b94c6193b3bb3d3ca46b18 (diff) |
C++ exceptions are disabled in all cases where they just prevent warnings
Diffstat (limited to 'protocols/Tox')
-rw-r--r-- | protocols/Tox/Tox.vcxproj | 5 | ||||
-rw-r--r-- | protocols/Tox/src/stdafx.h | 4 | ||||
-rw-r--r-- | protocols/Tox/src/tox_connection.cpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj index a550839300..5004a62a3a 100644 --- a/protocols/Tox/Tox.vcxproj +++ b/protocols/Tox/Tox.vcxproj @@ -30,11 +30,6 @@ <AdditionalIncludeDirectories>..\..\include;libtox\src\toxcore;libtox\src\toxencryptsave;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<None Include="res\*.ico" />
</ItemGroup>
diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index b1d360aae5..9dbf24a568 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -2,9 +2,11 @@ #define _COMMON_H_
#include <windows.h>
+#include <commctrl.h>
+
#include <io.h>
+#include <malloc.h>
#include <time.h>
-#include <commctrl.h>
#include <msapi/comptr.h>
#include <vector>
diff --git a/protocols/Tox/src/tox_connection.cpp b/protocols/Tox/src/tox_connection.cpp index fef16834c8..02ab9e223c 100644 --- a/protocols/Tox/src/tox_connection.cpp +++ b/protocols/Tox/src/tox_connection.cpp @@ -62,7 +62,7 @@ void CToxProto::OnToxCheck(void *arg, BYTE) { CToxProto *proto = (CToxProto*)arg; - int retriesCount = proto->getByte("MaxReconnectRetries", TOX_MAX_RECONNECT_RETRIES); + // int retriesCount = proto->getByte("MaxReconnectRetries", TOX_MAX_RECONNECT_RETRIES); if (proto->m_iStatus < ID_STATUS_ONLINE) proto->TryConnect(); else |