Fix bug #5914 - Build failure: redefinition of struct name_list

Jeremy.

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index ce2de4d7fe30c2379d52f03fcc0d5d5cd007aac7..9fc02bac13a07678e36040dccce05f76ba9ccdf6 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -30,15 +30,15 @@ static enum tree_level level = LEV_SHARE;
 
 /* Holds a list of workgroups or servers */
 
 
 /* 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;
 };
 
         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);
 {
         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)
 {
 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;
 
         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)
 {
 
 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 */
 
 
         /* List workgroups */