diff options
| author | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
| commit | 17e67cd29b94821892464537873a88bb6959c937 (patch) | |
| tree | 3ef1b99467f10988fbf6cf1ec6fb77c32d607bff /g10/gpgv.c | |
| parent | * idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on native (diff) | |
| download | gnupg-17e67cd29b94821892464537873a88bb6959c937.tar.gz gnupg-17e67cd29b94821892464537873a88bb6959c937.zip | |
* passphrase.c (agent_send_all_options): Make use of $GPG_TTY.
* g10.c (main): Disable use-agent if passphrase-fd is given later.
Suggested by Kurt Garloff.
* exec.c, g10.c, gpgv.c, passphrase.c, photoid.c: s/__MINGW32__/_WIN32/ to
help building on native Windows compilers. Requested by Brian Gladman.
From Werner on stable branch.
Diffstat (limited to '')
| -rw-r--r-- | g10/gpgv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index 5116f33ef..73af44ea5 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -153,7 +153,7 @@ main( int argc, char **argv ) opt.trust_model = TM_ALWAYS; opt.batch = 1; -#if defined (__MINGW32__) +#if defined (_WIN32) opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); #else opt.homedir = getenv("GNUPGHOME"); |