summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/smb.h2
-rw-r--r--source3/include/util_list.h58
3 files changed, 3 insertions, 61 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 51fc0d153b..3bb7d13f7f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -685,6 +685,9 @@ extern int errno;
#define NGROUPS_MAX 32 /* Guess... */
#endif
+/* Our own pstrings and fstrings */
+#include "pstring.h"
+
/* Lists, trees, caching, database... */
#include "xfile.h"
#include "intl.h"
@@ -700,7 +703,6 @@ extern int errno;
#include "trans2.h"
#include "nterr.h"
#include "messages.h"
-#include "util_list.h"
#include "charset.h"
#include "dynconfig.h"
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 357362f8a2..1ae250f9c6 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -149,8 +149,6 @@ typedef int BOOL;
#include "doserr.h"
-#include "pstring.h"
-
/*
* SMB UCS2 (16-bit unicode) internal type.
*/
diff --git a/source3/include/util_list.h b/source3/include/util_list.h
deleted file mode 100644
index 8761a7bb7d..0000000000
--- a/source3/include/util_list.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Samba utility functions
- Copyright (C) Andrew Tridgell 1992-1999
- Copyright (C) Gerald Carter <jerry@samba.org> 2000
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/******************************************************************
- Implementation of a generic list. See lib/util_list.c for
- details on using this.
- *****************************************************************/
-
-#include "smb.h"
-
-#ifndef _GENERIC_LIST_H
-#define _GENERIC_LIST_H
-
-struct _list_node;
-
-/*
- * node container in list
- */
-struct _list_node {
-
- void *data; /* generic container pointer */
- uint8 type; /* needed for identifiers
- in a hetergenous list */
- struct _list_node *next; /* next in the list */
-
-};
-
-/*
- * list data structure
- */
-typedef struct _generic_list {
-
- struct _list_node *head, *tail;
- uint32 length;
- BOOL initialized;
-
-} GENERIC_LIST;
-
-
-#endif /* _GENERIC_LIST_H */