The branch, master has been updated via f4f5ad9 s3:registry: proposed aix build fix for reg_parse_internal from b32625b s4:torture/ldap: close connections with an UnbindRequest
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f4f5ad97741d4c6be32573338baa346808e1f108 Author: Gregor Beck <gb...@sernet.de> Date: Fri Sep 24 11:29:09 2010 +0200 s3:registry: proposed aix build fix for reg_parse_internal Signed-off-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/registry/reg_parse_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/registry/reg_parse_internal.h b/source3/registry/reg_parse_internal.h index 56e2127..153d48c 100644 --- a/source3/registry/reg_parse_internal.h +++ b/source3/registry/reg_parse_internal.h @@ -29,7 +29,7 @@ struct cbuf; #define USE_NATIVE_ICONV -#ifdef USE_NATIVE_ICONV +#if defined USE_NATIVE_ICONV && defined HAVE_NATIVE_ICONV # define smb_iconv_t iconv_t # define smb_iconv(CD, IPTR, ILEN, OPTR, OLEN) \ iconv(CD, (char**)(IPTR), ILEN, OPTR, OLEN) -- Samba Shared Repository