[git] GpgOL - branch, master, updated. gpgol-2.0.6-68-gca90399

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  ca9039910b1171bf503d052dcdee898fa814aa3d (commit)
      from  53102e21518873edb355569469b9f98bd386d957 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ca9039910b1171bf503d052dcdee898fa814aa3d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 6 07:41:05 2018 +0100

    Fix w64 build
    
    * src/cryptcontroller.cpp (CryptController::resolve_keys): Use
    SIZE_T_FORMAT and hwnd conversion.
    * src/overlay.cpp (Overlay::Overlay): HWND cast to int is ok.

diff --git a/src/cryptcontroller.cpp b/src/cryptcontroller.cpp
index a977e79..b3d39e5 100644
--- a/src/cryptcontroller.cpp
+++ b/src/cryptcontroller.cpp
@@ -384,7 +384,7 @@ CryptController::resolve_keys ()
     {
       // Pass the handle of the active window for raise / overlay.
       args.push_back (std::string ("--hwnd"));
-      args.push_back (std::to_string ((int) wnd));
+      args.push_back (std::to_string ((int) (intptr_t) wnd));
     }
 
   // Set the overlay caption
@@ -451,7 +451,7 @@ CryptController::resolve_keys ()
   log_debug ("Spawning args:");
   for (size_t i = 0; cargs && cargs[i]; i++)
     {
-      log_debug ("%i: '%s'", i, cargs[i]);
+      log_debug (SIZE_T_FORMAT ": '%s'", i, cargs[i]);
     }
 #endif
 
diff --git a/src/overlay.cpp b/src/overlay.cpp
index a6ba341..2078bd4 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -46,7 +46,7 @@ Overlay::Overlay (HWND wid, const std::string &text): m_wid (wid)
   args.push_back (overlayer);
 
   args.push_back (std::string ("--hwnd"));
-  args.push_back (std::to_string ((int) wid));
+  args.push_back (std::to_string ((int) (intptr_t) wid));
 
   args.push_back (std::string ("--overlayText"));
   args.push_back (text);

-----------------------------------------------------------------------

Summary of changes:
 src/cryptcontroller.cpp | 4 ++--
 src/overlay.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org