summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-24 22:02:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-24 22:02:07 +0000
commit738bc36a24eb631c02edd0577656bebb1396a6e1 (patch)
tree70f0a28a821bd49813f930df2325ec38a8171a45
parent3814871378804c77bdbd7922e2bcd3b19118de00 (diff)
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@618 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/FirstRun/commonheaders.h1
-rw-r--r--plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters80
-rw-r--r--plugins/MirOTR/MirOTR/stdafx.h2
-rw-r--r--plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h2
4 files changed, 45 insertions, 40 deletions
diff --git a/plugins/FirstRun/commonheaders.h b/plugins/FirstRun/commonheaders.h
index daf961576a..1839f53fc1 100644
--- a/plugins/FirstRun/commonheaders.h
+++ b/plugins/FirstRun/commonheaders.h
@@ -1,4 +1,5 @@
#define MIRANDA_VER 0x0A00
+#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
#include <newpluginapi.h>
diff --git a/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters b/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
index 81a5adfd5b..278ee9f9a4 100644
--- a/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
+++ b/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
@@ -1,125 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Filter Include="Quelldateien">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Headerdateien">
+ <Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
- <Filter Include="Ressourcendateien">
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dbfilter.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="dialogs.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="dllmain.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="entities.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="icons.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mirotrmenu.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="options.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="otr.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="striphtml.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="svcs_menu.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="svcs_proto.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="svcs_srmm.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="utils.cpp">
- <Filter>Quelldateien</Filter>
+ <Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="dbfilter.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="dialogs.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="dllmain.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="entities.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="icons.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="language.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mirotrmenu.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="options.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="otr.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="stdafx.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="striphtml.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="svcs_menu.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="svcs_proto.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="svcs_srmm.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="targetver.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="utils.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="version.h">
- <Filter>Headerdateien</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resources\resource.rc">
- <Filter>Ressourcendateien</Filter>
+ <Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="resources\version.rc">
- <Filter>Ressourcendateien</Filter>
+ <Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/MirOTR/MirOTR/stdafx.h b/plugins/MirOTR/MirOTR/stdafx.h
index 3284939f41..f98a170587 100644
--- a/plugins/MirOTR/MirOTR/stdafx.h
+++ b/plugins/MirOTR/MirOTR/stdafx.h
@@ -7,6 +7,8 @@
#include "targetver.h"
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NON_CONFORMING_SWPRINTFS
#define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden.
// Windows-Headerdateien:
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h
index 08112a7610..45648a0762 100644
--- a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h
+++ b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h
@@ -22,6 +22,8 @@
#ifndef _GCRYPT_H
#define _GCRYPT_H
+#define _CRT_SECURE_NO_WARNINGS
+
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>