From: serassio <>
Date: Mon, 21 Jan 2008 00:31:11 +0000 (+0000)
Subject: Windows port: restore Windows compatibility changes to edir_ldapext.c lost after... 
X-Git-Tag: BASIC_TPROXY4~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5a88a5e286d3de54bf29c53d01950053b20e2fa;p=thirdparty%2Fsquid.git

Windows port: restore Windows compatibility changes to edir_ldapext.c lost after last commit.
---

diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.c b/helpers/digest_auth/eDirectory/edir_ldapext.c
index 2a7521c04d..3aafb08f65 100644
--- a/helpers/digest_auth/eDirectory/edir_ldapext.c
+++ b/helpers/digest_auth/eDirectory/edir_ldapext.c
@@ -23,10 +23,31 @@
  * 
 */
 
+#include "digest_common.h"
+
+#ifdef _SQUID_MSWIN_            /* Native Windows port and MinGW */
+
+#define snprintf _snprintf
+#include <windows.h>
+#include <winldap.h>
+#include <winber.h>
+#ifndef LDAPAPI
+#define LDAPAPI __cdecl
+#endif
+#ifdef LDAP_VERSION3
+#ifndef LDAP_OPT_X_TLS
+#define LDAP_OPT_X_TLS 0x6000
+#endif
+#define ber_alloc() ber_alloc_t(0)
+#endif /* LDAP_VERSION3 */
+
+#else
+
 #include <lber.h>
 #include <ldap.h>
+
+#endif
 #include <wchar.h>
-#include <stdlib.h>
 
 #include "edir_ldapext.h"