diff options
Diffstat (limited to '')
| -rw-r--r-- | common/argparse.c | 2 | ||||
| -rw-r--r-- | dirmngr/ks-engine-hkp.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/common/argparse.c b/common/argparse.c index f4180cfd9..c713bf609 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 0f0baab6b..762ab4ab0 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. */ |