r6812: more talloc portability tweaks

diff --git a/source/lib/talloc/config.m4 b/source/lib/talloc/config.m4
index 5f653e65776e44bd6819db39c0ace0f2d4290e8f..60e89f43929eb67cdd350b4d198a14d129e2071d 100644 (file)
--- a/source/lib/talloc/config.m4
+++ b/source/lib/talloc/config.m4
@@ -1,7 +1,3 @@
-if test x"$experimental" = x"yes"; then
-       SMB_LIBRARY_ENABLE(libtalloc,YES)
-fi
-
 AC_CACHE_CHECK([for va_copy],samba_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
 va_list ap1,ap2;], [va_copy(ap1,ap2);],
@@ -10,3 +6,4 @@ if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then
     AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
 fi
 
+AC_CHECK_TYPES(intptr_t)

diff --git a/source/lib/talloc/configure.in b/source/lib/talloc/configure.in
index 8a87ab87544d5c7cd881210e328d5b042c8c4a5a..8e7e8252fd58013b2b1c42fb3e5e16c27ffa2fcf 100644 (file)
--- a/source/lib/talloc/configure.in
+++ b/source/lib/talloc/configure.in
@@ -1,5 +1,4 @@
-AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
-AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
+AC_PREREQ(2.50)
 AC_INIT(talloc.h)
 AC_PROG_CC
 if test "x$GCC" = "xyes"; then

diff --git a/source/lib/talloc/talloc.c b/source/lib/talloc/talloc.c
index 01d1b9f2555b7a807d97a0b6f94defaf78d0815b..d3fa961c74055606d0d511b06e1cc8ed3cf93309 100644 (file)
--- a/source/lib/talloc/talloc.c
+++ b/source/lib/talloc/talloc.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>