Index: acinclude.m4
===================================================================
RCS file: /cvsroot/curl/curl/acinclude.m4,v
retrieving revision 1.131
diff -u -r1.131 acinclude.m4
--- acinclude.m4	15 Oct 2007 16:24:46 -0000	1.131
+++ acinclude.m4	15 Oct 2007 18:44:58 -0000
@@ -266,11 +266,13 @@
 #endif
 #include <windows.h>
 #else
-#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #endif
+#ifndef NULL
+#define NULL (void *)0
+#endif
 #include <lber.h>
       ],[
         BerValue *bvp = NULL;
@@ -296,11 +298,13 @@
 #endif
 #include <windows.h>
 #else
-#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #endif
+#ifndef NULL
+#define NULL (void *)0
+#endif
 #ifndef LDAP_DEPRECATED
 #define LDAP_DEPRECATED 1
 #endif
@@ -436,11 +440,13 @@
 #endif
 #include <windows.h>
 #else
-#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #endif
+#ifndef NULL
+#define NULL (void *)0
+#endif
 #ifndef LDAP_DEPRECATED
 #define LDAP_DEPRECATED 1
 #endif
@@ -498,11 +504,13 @@
 #endif
 #include <windows.h>
 #else
-#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #endif
+#ifndef NULL
+#define NULL (void *)0
+#endif
 #ifndef LDAP_DEPRECATED
 #define LDAP_DEPRECATED 1
 #endif
@@ -1689,10 +1697,12 @@
 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>
+#ifndef NULL
+#define NULL (void *)0
+#endif
 
 int
 main () {