diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-11 18:09:48 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-11 18:09:48 +0000 |
| commit | 324462d57d92078e16c9afc33e7d1da0bf2a3ad0 (patch) | |
| tree | 4f7bf80a0441d84bb7f29bf0665677fa5f745d54 | |
| parent | 617f54ab10339c153788107c7784e8bc6e4c4888 (diff) | |
git-svn-id: http://svn.miranda-ng.org/main/trunk@4920 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/CryptoPP/cryptopp_10.vcxproj | 4 | ||||
| -rw-r--r-- | plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj b/plugins/CryptoPP/cryptopp_10.vcxproj index 82b0b5b98d..1da100f02a 100644 --- a/plugins/CryptoPP/cryptopp_10.vcxproj +++ b/plugins/CryptoPP/cryptopp_10.vcxproj @@ -27,7 +27,6 @@ <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,7 +37,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -265,7 +263,7 @@ <ResourceCompile Include="src\GPGw\gpg.rc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="crypto\cryptlib_11.vcxproj">
+ <ProjectReference Include="crypto\cryptlib_10.vcxproj">
<Project>{290c5ed4-71a7-4040-ad26-4820cf7a9e60}</Project>
</ProjectReference>
</ItemGroup>
diff --git a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h index 9f2830ddf0..93a99825f8 100644 --- a/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h +++ b/plugins/CryptoPP/src/PGPw/sdk8/include/pgpEncode.h @@ -283,12 +283,12 @@ PGP_BEGIN_C_DECLARATIONS ** PGPOptionListRef's which describe the inputs, outputs, and options. */ -PGPError PGPEncode(PGPContextRef context, +PGPError PGPEncode(PGPContextRef context, PGPOptionListRef firstOption, ...); -PGPError PGPDecode(PGPContextRef context, +PGPError PGPDecode(PGPContextRef context, PGPOptionListRef firstOption, ...); -PGPError PGPAddJobOptions(PGPJobRef job, +PGPError PGPAddJobOptions(PGPJobRef job, PGPOptionListRef firstOption, ...); PGP_END_C_DECLARATIONS |