From: serassio <>
Date: Sun, 12 Aug 2007 02:45:40 +0000 (+0000)
Subject: Windows port: Allow build of eDirectory Digest helper using Visual Studio, also impro... 
X-Git-Tag: SQUID_3_0_PRE7~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a481edd3c8b0c60f77dd240481e858a3d6e531a;p=thirdparty%2Fsquid.git

Windows port: Allow build of eDirectory Digest helper using Visual Studio, also improved portability of LDAP Digest helper
---

diff --git a/helpers/digest_auth/eDirectory/digest_common.h b/helpers/digest_auth/eDirectory/digest_common.h
index 8804745aab..71ce579030 100644
--- a/helpers/digest_auth/eDirectory/digest_common.h
+++ b/helpers/digest_auth/eDirectory/digest_common.h
@@ -18,12 +18,18 @@
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#if HAVE_CTYPE_H
+#include <ctype.h>
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
+#if HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.c b/helpers/digest_auth/eDirectory/edir_ldapext.c
index c6711c5231..5c3a253857 100644
--- a/helpers/digest_auth/eDirectory/edir_ldapext.c
+++ b/helpers/digest_auth/eDirectory/edir_ldapext.c
@@ -19,9 +19,6 @@
  * find current contact  information at www.novell.com.
  */ 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
 #include "digest_common.h"
 
 #ifdef _SQUID_MSWIN_		/* Native Windows port and MinGW */
@@ -29,6 +26,7 @@
 #define snprintf _snprintf
 #include <windows.h>
 #include <winldap.h>
+#include <winber.h>
 #ifndef LDAPAPI
 #define LDAPAPI __cdecl
 #endif
diff --git a/helpers/digest_auth/ldap/digest_common.h b/helpers/digest_auth/ldap/digest_common.h
index 8804745aab..21e77a002f 100644
--- a/helpers/digest_auth/ldap/digest_common.h
+++ b/helpers/digest_auth/ldap/digest_common.h
@@ -18,6 +18,9 @@
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#if HAVE_CTYPE_H
+#include <ctype.h>
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/helpers/digest_auth/ldap/ldap_backend.c b/helpers/digest_auth/ldap/ldap_backend.c
index 7b0b975c8e..75312ad23e 100644
--- a/helpers/digest_auth/ldap/ldap_backend.c
+++ b/helpers/digest_auth/ldap/ldap_backend.c
@@ -8,10 +8,6 @@
 
 #define LDAP_DEPRECATED 1
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #include "ldap_backend.h"
 
 #ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */