From 61933e159cc2a8399f8bb1fa53844a67f8bba55b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Mar 2006 15:22:36 +0000
Subject: r14381: Kill structs.h (This used to be commit
 1ffb82a7596f989c90df69573083a2c2e28f8808)

---
 source4/param/config.mk |  2 +-
 source4/param/generic.c |  2 +-
 source4/param/generic.h | 41 -----------------------------------------
 source4/param/param.h   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 43 deletions(-)
 delete mode 100644 source4/param/generic.h
 create mode 100644 source4/param/param.h

(limited to 'source4/param')

diff --git a/source4/param/config.mk b/source4/param/config.mk
index 2304195e26..af7b98f23e 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -4,7 +4,7 @@ OBJ_FILES = loadparm.o \
 			generic.o \
 			../lib/version.o
 REQUIRED_SUBSYSTEMS = LIBBASIC 
-PRIVATE_PROTO_HEADER = param.h
+PRIVATE_PROTO_HEADER = proto.h
 
 PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
 	 -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
diff --git a/source4/param/generic.c b/source4/param/generic.c
index adf1eb0b31..bed675be69 100644
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
-#include "param/generic.h"
+#include "param/param.h"
 #include "system/filesys.h"
 
 struct param_section *param_get_section(struct param_context *ctx, const char *name)
diff --git a/source4/param/generic.h b/source4/param/generic.h
deleted file mode 100644
index 1d3a5c7cb3..0000000000
--- a/source4/param/generic.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Generic parameter parsing interface
-   Copyright (C) Jelmer Vernooij					  2005
-   
-   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.
-*/
-
-#ifndef _PARAM_GENERIC_H /* _PARAM_GENERIC_H */
-#define _PARAM_GENERIC_H 
-
-struct param_context {
-	struct param_section *sections;
-};
-
-struct param {
-	const char *name;
-	char *value;
-	const char **list_value;
-	struct param *prev, *next;
-};
-
-struct param_section {
-	const char *name;
-	struct param_section *prev, *next;
-	struct param *parameters;
-};
-
-#endif /* _PARAM_GENERIC_H */
diff --git a/source4/param/param.h b/source4/param/param.h
new file mode 100644
index 0000000000..923b06eb86
--- /dev/null
+++ b/source4/param/param.h
@@ -0,0 +1,46 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Generic parameter parsing interface
+   Copyright (C) Jelmer Vernooij					  2005
+   
+   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.
+*/
+
+#ifndef _PARAM_H /* _PARAM_H */
+#define _PARAM_H 
+
+struct param_context {
+	struct param_section *sections;
+};
+
+struct param {
+	const char *name;
+	char *value;
+	const char **list_value;
+	struct param *prev, *next;
+};
+
+struct param_section {
+	const char *name;
+	struct param_section *prev, *next;
+	struct param *parameters;
+};
+
+struct param_context;
+struct smbsrv_connection;
+
+#include "param/proto.h"
+
+#endif /* _PARAM_H */
-- 
cgit