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/photoid.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/photoid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/photoid.c b/g10/photoid.c index b311bfa09..055a076be 100644 --- a/g10/photoid.c +++ b/g10/photoid.c @@ -22,7 +22,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#ifdef __MINGW32__ +#ifdef _WIN32 # include <windows.h> # ifndef VER_PLATFORM_WIN32_WINDOWS # define VER_PLATFORM_WIN32_WINDOWS 1 @@ -223,7 +223,7 @@ char *image_type_to_string(byte type,int style) #if !defined(FIXED_PHOTO_VIEWER) && !defined(DISABLE_PHOTO_VIEWER) static const char *get_default_photo_command(void) { -#if defined(__MINGW32__) +#if defined(_WIN32) OSVERSIONINFO osvi; memset(&osvi,0,sizeof(osvi)); |