From d25d9c90e8effaad3b38a25c91eae218be35669a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 25 Nov 2008 15:55:46 -0800 Subject: [PATCH] Fix bug #5914 - Build failure: redefinition of struct name_list Jeremy. (cherry picked from commit 57e2769b34f3e156af734304e0c342a8cd1821e2) --- source/utils/smbtree.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c index b070c0eb44c..20f4bbe04f8 100644 --- a/source/utils/smbtree.c +++ b/source/utils/smbtree.c @@ -30,15 +30,15 @@ static enum tree_level level = LEV_SHARE; /* Holds a list of workgroups or servers */ -struct name_list { - struct name_list *prev, *next; +struct smb_name_list { + struct smb_name_list *prev, *next; char *name, *comment; uint32 server_type; }; -static struct name_list *workgroups, *servers, *shares; +static struct smb_name_list *workgroups, *servers, *shares; -static void free_name_list(struct name_list *list) +static void free_name_list(struct smb_name_list *list) { while(list) DLIST_REMOVE(list, list); @@ -47,10 +47,10 @@ static void free_name_list(struct name_list *list) static void add_name(const char *machine_name, uint32 server_type, const char *comment, void *state) { - struct name_list **name_list = (struct name_list **)state; - struct name_list *new_name; + struct smb_name_list **name_list = (struct smb_name_list **)state; + struct smb_name_list *new_name; - new_name = SMB_MALLOC_P(struct name_list); + new_name = SMB_MALLOC_P(struct smb_name_list); if (!new_name) return; @@ -221,7 +221,7 @@ static bool get_shares(char *server_name, struct user_auth_info *user_info) static bool print_tree(struct user_auth_info *user_info) { - struct name_list *wg, *sv, *sh; + struct smb_name_list *wg, *sv, *sh; /* List workgroups */ -- 2.11.4.GIT