From a716d39a60b0197cc7944e713b3ecd3ea055dfef Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jun 2012 15:05:52 +0000 Subject: warning fixes in OTR git-svn-id: http://svn.miranda-ng.org/main/trunk@634 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/MirOTR/MirOTR.vcxproj | 16 ++++++++-------- plugins/MirOTR/MirOTR/stdafx.h | 1 - plugins/MirOTR/ekhtml/EkHtml.vcxproj | 8 ++++---- plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj | 8 ++++---- plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h | 4 +--- plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj | 8 ++++---- 6 files changed, 21 insertions(+), 24 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/MirOTR/MirOTR.vcxproj b/plugins/MirOTR/MirOTR/MirOTR.vcxproj index 91997296d7..4e89e8835d 100644 --- a/plugins/MirOTR/MirOTR/MirOTR.vcxproj +++ b/plugins/MirOTR/MirOTR/MirOTR.vcxproj @@ -72,7 +72,7 @@ Disabled ..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -89,7 +89,7 @@ $(IntDir) - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\..\include\msapi @@ -97,7 +97,7 @@ Disabled ..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -113,7 +113,7 @@ $(IntDir) - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\..\include\msapi @@ -123,7 +123,7 @@ OnlyExplicitInline Size ..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use Level3 @@ -142,7 +142,7 @@ $(IntDir) - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\..\include\msapi @@ -152,7 +152,7 @@ OnlyExplicitInline Size ..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use Level3 @@ -171,7 +171,7 @@ $(IntDir) - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\..\include\msapi diff --git a/plugins/MirOTR/MirOTR/stdafx.h b/plugins/MirOTR/MirOTR/stdafx.h index f98a170587..1315faa961 100644 --- a/plugins/MirOTR/MirOTR/stdafx.h +++ b/plugins/MirOTR/MirOTR/stdafx.h @@ -7,7 +7,6 @@ #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. diff --git a/plugins/MirOTR/ekhtml/EkHtml.vcxproj b/plugins/MirOTR/ekhtml/EkHtml.vcxproj index 4974b58fd9..2acdd12706 100644 --- a/plugins/MirOTR/ekhtml/EkHtml.vcxproj +++ b/plugins/MirOTR/ekhtml/EkHtml.vcxproj @@ -71,7 +71,7 @@ Disabled include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -83,7 +83,7 @@ Disabled include;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 @@ -93,7 +93,7 @@ Full include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Level3 Fast @@ -106,7 +106,7 @@ Full include;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Level3 Fast diff --git a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj index b218a4368d..18d39ec330 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj +++ b/plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj @@ -72,7 +72,7 @@ Full custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 Fast Size @@ -82,7 +82,7 @@ Full custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 Fast Size @@ -92,7 +92,7 @@ Disabled custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 @@ -103,7 +103,7 @@ Disabled custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 diff --git a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h index 45648a0762..8c110fec0b 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h +++ b/plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h @@ -22,8 +22,6 @@ #ifndef _GCRYPT_H #define _GCRYPT_H -#define _CRT_SECURE_NO_WARNINGS - #include #include #include @@ -40,7 +38,7 @@ # include # include # ifndef __GNUC__ - typedef long ssize_t; + typedef signed int ssize_t; typedef int pid_t; # endif /*!__GNUC__*/ #else diff --git a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj index a7003384e6..001c1bdbc3 100644 --- a/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj +++ b/plugins/MirOTR/libotr-3.2.0/libotr320.vcxproj @@ -72,7 +72,7 @@ Disabled custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 @@ -85,7 +85,7 @@ /D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions) Disabled custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 @@ -96,7 +96,7 @@ /D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions) Full custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 Fast Size @@ -107,7 +107,7 @@ /D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions) Full custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 Fast Size -- cgit v1.2.3