diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-25 15:54:53 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-26 11:23:12 +0100 |
| commit | 5207cd4f0b8c0013027c6e967b210db2a69dbf16 (patch) | |
| tree | 9e37968e9c1d2ff32301af95bb1e94b8415a5a68 | |
| parent | d272c6e8937ae448a19fd21b689d3ae3cb99ae26 (diff) | |
| download | samba-5207cd4f0b8c0013027c6e967b210db2a69dbf16.tar.gz | |
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
(cherry picked from commit 528e01f402e54f8d6c1b74a5b7647c037f456412)
| -rw-r--r-- | source/utils/smbtree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c index ce2de4d7fe3..9fc02bac13a 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; @@ -222,7 +222,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 */ |