diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/asshelp.c | 4 | ||||
| -rw-r--r-- | common/dotlock.c | 1 | ||||
| -rw-r--r-- | common/logging.c | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/common/asshelp.c b/common/asshelp.c index cfbc3ac16..b5dde5a46 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -484,7 +484,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, of the required features except for passphrase caching etc. */ const char *pgmname; - int no_close_list[3]; + assuan_fd_t no_close_list[3]; int i; if ( !(pgmname = strrchr (agent_program, '/'))) @@ -500,7 +500,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, if (log_get_fd () != -1) no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ()); no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr)); - no_close_list[i] = -1; + no_close_list[i] = ASSUAN_INVALID_FD; /* Connect to the agent and perform initial handshaking. */ err = assuan_pipe_connect (ctx, agent_program, argv, diff --git a/common/dotlock.c b/common/dotlock.c index c111159d4..c5520dbb4 100644 --- a/common/dotlock.c +++ b/common/dotlock.c @@ -311,6 +311,7 @@ #ifdef GNUPG_MAJOR_VERSION # include "libjnlib-config.h" +# include "stringhelp.h" /* For stpcpy and w32_strerror. */ #endif #ifdef HAVE_W32CE_SYSTEM # include "utf8conv.h" /* WindowsCE requires filename conversion. */ diff --git a/common/logging.c b/common/logging.c index bdc284fef..40d098c89 100644 --- a/common/logging.c +++ b/common/logging.c @@ -257,7 +257,9 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) else { char *addrstr, *p; +#ifdef HAVE_INET_PTON void *addrbuf = NULL; +#endif /*HAVE_INET_PTON*/ addrstr = jnlib_malloc (strlen (name) + 1); if (!addrstr) @@ -281,7 +283,9 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) memset (&srvr_addr_in6, 0, sizeof srvr_addr_in6); srvr_addr_in6.sin6_family = af; srvr_addr_in6.sin6_port = htons (port); +#ifdef HAVE_INET_PTON addrbuf = &srvr_addr_in6.sin6_addr; +#endif /*HAVE_INET_PTON*/ srvr_addr = (struct sockaddr *)&srvr_addr_in6; addrlen = sizeof srvr_addr_in6; #else @@ -306,7 +310,9 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) memset (&srvr_addr_in, 0, sizeof srvr_addr_in); srvr_addr_in.sin_family = af; srvr_addr_in.sin_port = htons (port); +#ifdef HAVE_INET_PTON addrbuf = &srvr_addr_in.sin_addr; +#endif /*HAVE_INET_PTON*/ srvr_addr = (struct sockaddr *)&srvr_addr_in; addrlen = sizeof srvr_addr_in; } |