Author: jelmer Date: 2006-03-30 11:20:47 +0000 (Thu, 30 Mar 2006) New Revision: 14816
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14816 Log: Simplify test for comparison_fn_t Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.h branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/lib/replace/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.h =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-03-30 11:07:17 UTC (rev 14815) +++ branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-03-30 11:20:47 UTC (rev 14816) @@ -24,6 +24,8 @@ #ifndef __GENSEC_H__ #define __GENSEC_H__ +#include "core.h" + #define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10" #define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2" #define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2" Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 11:07:17 UTC (rev 14815) +++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 11:20:47 UTC (rev 14816) @@ -714,23 +714,3 @@ AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and struct fs_data is available]) fi fi - - - -####################################### -# Check for comparison_fn_t -AC_CACHE_CHECK([for comparison_fn_t],samba_cv_HAVE_COMPARISON_FN_T,[ -AC_TRY_COMPILE([ -#include <stdlib.h> -int list_find(const void *needle, - const void *base, size_t nmemb, size_t size, comparison_fn_t comp_fn) -{ - return 1; -} -],[], -samba_cv_HAVE_COMPARISON_FN_T=yes,samba_cv_HAVE_COMPARISON_FN_T=no) -]) -if test x"$samba_cv_HAVE_COMPARISON_FN_T" = x"yes"; then - AC_DEFINE(HAVE_COMPARISON_FN_T,1,[Whether or not we have comparison_fn_t]) -fi - Modified: branches/SAMBA_4_0/source/lib/replace/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-03-30 11:07:17 UTC (rev 14815) +++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-03-30 11:20:47 UTC (rev 14816) @@ -11,6 +11,8 @@ AC_CHECK_TYPE(u_int16_t, unsigned short) AC_CHECK_TYPE(u_int8_t, unsigned char) AC_CHECK_TYPE(ssize_t, int) +AC_CHECK_TYPE(comparison_fn_t, +[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])]) AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[ AC_TRY_RUN([