diff options
| author | Werner Koch <[email protected]> | 2014-03-07 08:46:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-07 15:06:35 +0000 |
| commit | 3032fc3ad78ac9ed857570844547afed520d635a (patch) | |
| tree | 5aa245750d356cbdf6e7d51fb97b7c0fc8d4dc17 /common/asshelp.c | |
| parent | w32: Include winsock2.h to silence warnings. (diff) | |
| download | gnupg-3032fc3ad78ac9ed857570844547afed520d635a.tar.gz gnupg-3032fc3ad78ac9ed857570844547afed520d635a.zip | |
Silence several warnings when building under Windows.
* agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
(start_pinentry): Ditto.
* common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
* common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
prototypes on Windows and some other platforms.
* common/logging.c (fun_writer): Declare addrbuf only if needed.
* g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
* g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
mode.
* g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
by -1 as temporary hack for Windows.
* g10/export.c (do_export): Ditto.
* g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
* g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
* g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
--
The gpg server mode is not actual working and thus we can avoid the
warnings by explicitly disabling the mode. We keep it working under
Unix, though.
Diffstat (limited to 'common/asshelp.c')
| -rw-r--r-- | common/asshelp.c | 4 |
1 files changed, 2 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, |