aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/photoid.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 21c44df4e..2e51d35ca 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-30 Werner Koch <[email protected]>
+
+ * photoid.c: Use __MINGW32__ to include windows because
+ HAVE_DOSISH_SYSTEM is also set for OS/2 and plain DOS. Provide
+ constant missing in older mingw installations.
+
2002-06-21 Stefan Bellon <[email protected]>
* g10.c [__riscos__]: Moved RISC OS specific stuff to util/riscos.c
diff --git a/g10/photoid.c b/g10/photoid.c
index 66240ecc2..fb7f7b91f 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -22,8 +22,11 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_DOSISH_SYSTEM
-#include <windows.h>
+#ifdef __MINGW32__
+# include <windows.h>
+# ifndef VER_PLATFORM_WIN32_WINDOWS
+# define VER_PLATFORM_WIN32_WINDOWS 1
+# endif
#endif
#include "packet.h"
#include "status.h"