[git] GpgOL - branch, master, updated. gpgol-1.4.0-158-g2d8b5a6

[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  2d8b5a6152756104ed96c8002688873397642db3 (commit)
      from  bdadab4da361860fbc1176cfb41dd7561bf50f84 (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 2d8b5a6152756104ed96c8002688873397642db3
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 11 17:23:13 2016 +0100

    Use _WIN64 instead of WIN64 to detect arch
    
    * common_indep.h, config-dialog.c, olflange-dlgs.cpp: Use
    _WIN64 instead of WIN64.
    
    --
    Somehow WIN64 is no longer defined by my mingw like
    it was before. _WIN64 is more correct.

diff --git a/src/common_indep.h b/src/common_indep.h
index b1dcb4c..ec7f026 100644
--- a/src/common_indep.h
+++ b/src/common_indep.h
@@ -35,12 +35,12 @@
 #endif
 
 /* The Registry key used by Gpg4win.  */
-#ifdef WIN64
+#ifdef _WIN64
 # define GPG4WIN_REGKEY_2  "Software\\Wow6432Node\\GNU\\GnuPG"
 #else
 # define GPG4WIN_REGKEY_2  "Software\\GNU\\GnuPG"
 #endif
-#ifdef WIN64
+#ifdef _WIN64
 # define GPG4WIN_REGKEY_3  "Software\\Wow6432Node\\Gpg4win"
 #else
 # define GPG4WIN_REGKEY_3  "Software\\Gpg4win"
@@ -378,7 +378,7 @@ _gpgol_stpcpy (char *a, const char *b)
 #define stpcpy(a,b) _gpgol_stpcpy ((a), (b))
 #endif /*!HAVE_STPCPY*/
 
-#ifdef WIN64
+#ifdef _WIN64
 #define SIZE_T_FORMAT "%I64u"
 #else
 # ifdef HAVE_W32_SYSTEM
diff --git a/src/config-dialog.c b/src/config-dialog.c
index 9a5508f..2f46a8f 100644
--- a/src/config-dialog.c
+++ b/src/config-dialog.c
@@ -180,7 +180,7 @@ config_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 void
 config_dialog_box (HWND parent)
 {
-#ifndef WIN64
+#ifndef _WIN64
   int resid;
 
   resid = IDD_EXT_OPTIONS;
diff --git a/src/olflange-dlgs.cpp b/src/olflange-dlgs.cpp
index 0fed8a4..dbd0505 100644
--- a/src/olflange-dlgs.cpp
+++ b/src/olflange-dlgs.cpp
@@ -279,7 +279,7 @@ GPGOptionsDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
           break;
 	}
 
-#ifndef WIN64
+#ifndef _WIN64
       /* SetWindowLong is not portable according to msdn
          it should be replaced by SetWindowLongPtr. But
          as this here is code for Outlook < 2010 we don't

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

Summary of changes:
 src/common_indep.h    | 6 +++---
 src/config-dialog.c   | 2 +-
 src/olflange-dlgs.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


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