[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-4-g141d69c

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  141d69cb2a94a752244e89f49611923a2f184dfd (commit)
      from  45ed901c466bd72118c2844069f566e190d847d6 (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 141d69cb2a94a752244e89f49611923a2f184dfd
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 10 15:11:32 2014 +0200

    w32: Fix build problem with dirmngr.
    
    * dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
    constant.

diff --git a/common/argparse.c b/common/argparse.c
index f4180cf..c713bf6 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -1336,7 +1336,7 @@ strusage( int level )
       break;
     case 11: p = "foo"; break;
     case 13: p = "0.0"; break;
-    case 14: p = "Copyright (C) 2012 Free Software Foundation, Inc."; break;
+    case 14: p = "Copyright (C) 2014 Free Software Foundation, Inc."; break;
     case 15: p =
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n";
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 0f0baab..762ab4a 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -40,10 +40,17 @@
 #include "userids.h"
 #include "ks-engine.h"
 
-/* Substitute a missing Mingw macro.  */
+/* Substitutes for missing Mingw macro.  The EAI_SYSTEM mechanism
+   seems not to be available (probably because there is only one set
+   of error codes anyway).  For now we use WSAEINVAL. */
 #ifndef EAI_OVERFLOW
 # define EAI_OVERFLOW EAI_FAIL
 #endif
+#ifdef HAVE_W32_SYSTEM
+# ifndef EAI_SYSTEM
+#  define EAI_SYSTEM WSAEINVAL
+# endif
+#endif
 
 
 /* Number of seconds after a host is marked as resurrected.  */

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

Summary of changes:
 common/argparse.c       |    2 +-
 dirmngr/ks-engine-hkp.c |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org