From 93d85ca5fd57d87e720ab627865f0e5af25e07b5 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 6 Dec 2010 11:06:27 +0100 Subject: s4:fix some shadowed declaration warnings on Solaris by renaming the symbols --- source4/rpc_server/lsa/dcesrv_lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index a3c8846376..0854f25284 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -4051,7 +4051,7 @@ static NTSTATUS make_ft_info(TALLOC_CTX *mem_ctx, } static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info, - uint32_t index, uint32_t collision_type, + uint32_t idx, uint32_t collision_type, uint32_t conflict_type, const char *tdo_name); static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx, -- cgit