diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-05-16 06:33:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:46 -0500 |
| commit | 3fd2a38e62a9c7c444d7dd9f56673fa216a00fdd (patch) | |
| tree | ee801149a16160ab5d2a8340aed6f9852683de97 /source4 | |
| parent | fc748e650fa2d6f9247f00105f709b403a7aa8a0 (diff) | |
| download | samba-3fd2a38e62a9c7c444d7dd9f56673fa216a00fdd.tar.gz samba-3fd2a38e62a9c7c444d7dd9f56673fa216a00fdd.tar.bz2 samba-3fd2a38e62a9c7c444d7dd9f56673fa216a00fdd.zip | |
r6812: more talloc portability tweaks
(This used to be commit 450ac2e4dea25910ee5384747bdb6ad7323e967d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/talloc/config.m4 | 5 | ||||
| -rw-r--r-- | source4/lib/talloc/configure.in | 3 | ||||
| -rw-r--r-- | source4/lib/talloc/talloc.c | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/lib/talloc/config.m4 b/source4/lib/talloc/config.m4 index 5f653e6577..60e89f4392 100644 --- a/source4/lib/talloc/config.m4 +++ b/source4/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/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in index 8a87ab8754..8e7e8252fd 100644 --- a/source4/lib/talloc/configure.in +++ b/source4/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/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 01d1b9f255..d3fa961c74 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/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> |