diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-14 15:22:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:17 -0500 |
| commit | 61933e159cc2a8399f8bb1fa53844a67f8bba55b (patch) | |
| tree | baba882669ebcca5508caadf017fe2e81e561d6c /source4/param | |
| parent | e3f2414cf9e582a4e4deecc662b64a7bb2679a34 (diff) | |
| download | samba-61933e159cc2a8399f8bb1fa53844a67f8bba55b.tar.gz samba-61933e159cc2a8399f8bb1fa53844a67f8bba55b.tar.bz2 samba-61933e159cc2a8399f8bb1fa53844a67f8bba55b.zip | |
r14381: Kill structs.h
(This used to be commit 1ffb82a7596f989c90df69573083a2c2e28f8808)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/config.mk | 2 | ||||
| -rw-r--r-- | source4/param/generic.c | 2 | ||||
| -rw-r--r-- | source4/param/param.h (renamed from source4/param/generic.h) | 11 |
3 files changed, 10 insertions, 5 deletions
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/param.h index 1d3a5c7cb3..923b06eb86 100644 --- a/source4/param/generic.h +++ b/source4/param/param.h @@ -18,8 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _PARAM_GENERIC_H /* _PARAM_GENERIC_H */ -#define _PARAM_GENERIC_H +#ifndef _PARAM_H /* _PARAM_H */ +#define _PARAM_H struct param_context { struct param_section *sections; @@ -38,4 +38,9 @@ struct param_section { struct param *parameters; }; -#endif /* _PARAM_GENERIC_H */ +struct param_context; +struct smbsrv_connection; + +#include "param/proto.h" + +#endif /* _PARAM_H */ |