diff options
| -rw-r--r-- | source4/include/includes.h | 1 | ||||
| -rw-r--r-- | source4/include/structs.h | 32 | ||||
| -rw-r--r-- | source4/lib/samba3/samba3.h | 2 | ||||
| -rw-r--r-- | source4/lib/util/util.h | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 4 | ||||
| -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 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls_param.c | 2 |
9 files changed, 18 insertions, 40 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 1a2ff68359..43e07ad482 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -111,7 +111,6 @@ enum brl_type { #include "talloc/talloc.h" #include "core.h" #include "charset/charset.h" -#include "structs.h" #include "util/util.h" #include "param/param.h" #include "libcli/util/nterr.h" diff --git a/source4/include/structs.h b/source4/include/structs.h deleted file mode 100644 index 19a811da9f..0000000000 --- a/source4/include/structs.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Copyright (C) Andrew Tridgell 2004 - - 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. -*/ - -/* - this file contains pre-declarations of private structures to avoid the - "scope is only this definition or declaration" warning -*/ - -struct asn1_data; -struct smbsrv_tcon; -struct smbsrv_connection; -struct param_context; -struct smbcli_tree; -struct smb2_tree; -struct socket_address; diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h index e66be625e0..cfe0f7904a 100644 --- a/source4/lib/samba3/samba3.h +++ b/source4/lib/samba3/samba3.h @@ -23,7 +23,7 @@ #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/samr.h" -#include "param/generic.h" +#include "param/param.h" struct samba3_samaccount { uint32_t logon_time, diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h index 318e497105..e0255c692c 100644 --- a/source4/lib/util/util.h +++ b/source4/lib/util/util.h @@ -30,6 +30,8 @@ */ struct substitute_context; +struct asn1_data; +struct smbsrv_tcon; #include "util/xfile.h" #include "util/debug.h" diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 567246031a..517df4bf7e 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -249,6 +249,10 @@ struct rpc_request { struct epm_tower; struct epm_floor; +struct smbcli_tree; +struct smb2_tree; +struct socket_address; + #include "librpc/rpc/dcerpc_proto.h" #endif /* __DCERPC_H__ */ 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 */ diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c index 23f90c971e..0169e09709 100644 --- a/source4/scripting/ejs/smbcalls_param.c +++ b/source4/scripting/ejs/smbcalls_param.c @@ -23,7 +23,7 @@ #include "includes.h" #include "scripting/ejs/smbcalls.h" #include "lib/appweb/ejs/ejs.h" -#include "param/generic.h" +#include "param/param.h" /* get parameter |