sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r17264: - remove unused includes from talloc

Browse Source 
- check explicit check for varargs.h as fallback from stdarg.h
  and fail the build if both are not present

metze
This commit is contained in:
Stefan Metzmacher 2006-07-26 17:34:50 +00:00 committed by Gerald (Jerry) Carter
parent 195754b169
commit b091d182fe
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/talloc/config.m4
View File

@ -1,3 +1,6 @@
AC_CHECK_HEADERS(stdarg.h vararg.h)
dnl VA_COPY
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);],
@ -6,8 +9,17 @@ if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then
AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
fi
if test x"$samba_cv_HAVE_VA_COPY" != x"yes"; then
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);],
samba_cv_HAVE___VA_COPY=yes,samba_cv_HAVE___VA_COPY=no)])
if test x"$samba_cv_HAVE___VA_COPY" = x"yes"; then
AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
fi
fi
AC_CHECK_TYPE(intptr_t, unsigned long long)
AC_CHECK_HEADERS(stdint.h stdarg.h unistd.h sys/types.h)
AC_CHECK_SIZEOF(size_t,cross)
AC_CHECK_SIZEOF(void *,cross)

18
source/lib/talloc/talloc.c
View File

@ -37,22 +37,12 @@
#include <string.h>
#include <errno.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_STDARG_H
#if defined(HAVE_STDARG_H)
#include <stdarg.h>
#else
#elif defined (HAVE_VARARGS_H)
#include <varargs.h>
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#error "no var arg header"
#endif
#include "talloc.h"