Merge with Update to VS 2017
authorThomas
Tue, 11 Dec 2018 10:36:18 +0100
changeset 325db7a5f9cb673
parent 293 262897d139e5
parent 324 ef317c83c07a
child 326 83b46d64c11d
child 327 d7888d794fe8
Merge with Update to VS 2017
     1.1 --- a/pEpCOMServerAdapter.vcxproj	Thu Oct 04 08:31:10 2018 +0200
     1.2 +++ b/pEpCOMServerAdapter.vcxproj	Tue Dec 11 10:36:18 2018 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  <?xml version="1.0" encoding="utf-8"?>
     1.5 -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.6 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.7    <ItemGroup Label="ProjectConfigurations">
     1.8      <ProjectConfiguration Include="Debug|Win32">
     1.9        <Configuration>Debug</Configuration>
    1.10 @@ -13,19 +13,19 @@
    1.11    <PropertyGroup Label="Globals">
    1.12      <ProjectGuid>{A27BD6BF-63BC-473D-B8BD-84ACB085F39C}</ProjectGuid>
    1.13      <Keyword>AtlProj</Keyword>
    1.14 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    1.15 +    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    1.16    </PropertyGroup>
    1.17    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    1.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    1.19      <ConfigurationType>Application</ConfigurationType>
    1.20      <UseDebugLibraries>true</UseDebugLibraries>
    1.21 -    <PlatformToolset>v140</PlatformToolset>
    1.22 +    <PlatformToolset>v141</PlatformToolset>
    1.23      <CharacterSet>Unicode</CharacterSet>
    1.24    </PropertyGroup>
    1.25    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1.26      <ConfigurationType>Application</ConfigurationType>
    1.27      <UseDebugLibraries>false</UseDebugLibraries>
    1.28 -    <PlatformToolset>v140</PlatformToolset>
    1.29 +    <PlatformToolset>v141</PlatformToolset>
    1.30      <CharacterSet>Unicode</CharacterSet>
    1.31    </PropertyGroup>
    1.32    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     2.1 --- a/pEp_utility.cpp	Thu Oct 04 08:31:10 2018 +0200
     2.2 +++ b/pEp_utility.cpp	Tue Dec 11 10:36:18 2018 +0100
     2.3 @@ -334,9 +334,9 @@
     2.4              msg2->LongMsgFormatted = bstr(msg->longmsg_formatted);
     2.5              msg2->Attachments = array_from_C<Blob, bloblist_t>(msg->attachments);
     2.6              if (msg->sent)
     2.7 -                msg2->Sent = mktime(msg->sent);
     2.8 +                msg2->Sent = _mkgmtime(msg->sent);
     2.9              if (msg->recv)
    2.10 -                msg2->Recv = mktime(msg->recv);
    2.11 +                msg2->Recv = _mkgmtime(msg->recv);
    2.12              msg2->From = identity_s(msg->from);
    2.13              msg2->To = array_from_C<pEpIdentity, identity_list>(msg->to);
    2.14              msg2->RecvBy = identity_s(msg->recv_by);