aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog2
-rw-r--r--keyserver/gpgkeys_ldap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 7a0a261de..4355c253b 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,7 +1,7 @@
2004-07-20 Werner Koch <[email protected]>
* gpgkeys_ldap.c [_WIN32]: Include Windows specific header files.
- Suggested by Brian Gladman.
+ Suggested by Brian Gladman. Don't do it for mingw32/cpd.
2004-01-13 Werner Koch <[email protected]>
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index c233644c9..76a4049bb 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -32,7 +32,7 @@
#include <lber.h>
#endif
-#ifdef _WIN32
+#if defined (_WIN32) && !defined (__MINGW32_CPD__)
#include <winsock2.h>
#include <winldap.h>
#else