summaryrefslogtreecommitdiff
path: root/plugins/MirOTR/libgcrypt-1.4.6
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-25 15:05:52 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-25 15:05:52 +0000
commita716d39a60b0197cc7944e713b3ecd3ea055dfef (patch)
treefa39903f630281f536a30902e8ac9cd03e5b3c47 /plugins/MirOTR/libgcrypt-1.4.6
parented1449fa491e90197b78b64b52c70910f1736dd7 (diff)
warning fixes in OTR
git-svn-id: http://svn.miranda-ng.org/main/trunk@634 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/libgcrypt-1.4.6')
-rw-r--r--plugins/MirOTR/libgcrypt-1.4.6/libgcrypt146lib.vcxproj8
-rw-r--r--plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h4
2 files changed, 5 insertions, 7 deletions
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 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -82,7 +82,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FloatingPointModel>Fast</FloatingPointModel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -92,7 +92,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
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 <stdlib.h>
#include <stdarg.h>
#include <string.h>
@@ -40,7 +38,7 @@
# include <ws2tcpip.h>
# include <time.h>
# ifndef __GNUC__
- typedef long ssize_t;
+ typedef signed int ssize_t;
typedef int pid_t;
# endif /*!__GNUC__*/
#else