aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acinclude.m47
-rw-r--r--lib/url.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d477f0785..fe62273f2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -266,6 +266,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
#endif
#include <windows.h>
#else
+#include <stddef.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -295,6 +296,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
#endif
#include <windows.h>
#else
+#include <stddef.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -434,6 +436,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAPSSL], [
#endif
#include <windows.h>
#else
+#include <stddef.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -495,6 +498,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
#endif
#include <windows.h>
#else
+#include <stddef.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -507,7 +511,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
#endif
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#endif"
+#endif
],[
BerValue *bvp = NULL;
BerElement *bep = ber_init(bvp);
@@ -1685,6 +1689,7 @@ dnl
AC_DEFUN([CURL_CHECK_WORKING_RESOLVER],[
AC_MSG_CHECKING([if "localhost" resolves])
AC_TRY_RUN([
+#include <stddef.h>
#include <string.h>
#include <sys/types.h>
#include <netdb.h>
diff --git a/lib/url.c b/lib/url.c
index 549e640b3..e6b0d7f27 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -242,7 +242,7 @@ static const struct Curl_handler * const protocols[] = {
&Curl_handler_ldap,
#endif
-#if defined(HAVE_LDAP_SSL) && !defined(CURL_DISABLE_SSL)
+#if !defined(CURL_DISABLE_LDAP) && defined(HAVE_LDAP_SSL)
&Curl_handler_ldaps,
#endif