r14380: Reduce the size of structs.h

(This used to be commit 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe)

6 files changed, 46 insertions, 1 deletions

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 5a0f920361..63c0a51937 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -105,7 +105,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSERVICE
 [SUBSYSTEM::service]
-PRIVATE_PROTO_HEADER = service.h
+PRIVATE_PROTO_HEADER = service_proto.h
 OBJ_FILES = \
 		service.o \
 		service_stream.o \
diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h
index d525ce9cdd..27fac68bb9 100644
--- a/source4/smbd/process_model.h
+++ b/source4/smbd/process_model.h
@@ -22,6 +22,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __PROCESS_MODEL_H__
+#define __PROCESS_MODEL_H__
+
 #include "lib/socket/socket.h"
 
 /* modules can use the following to determine if the interface has changed
@@ -65,3 +68,5 @@ struct process_model_critical_sizes {
 };
 
 #include "smbd/process_model_proto.h"
+
+#endif /* __PROCESS_MODEL_H__ */
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index c68c436d52..c472581a06 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -33,6 +33,7 @@
 #include "ldb/include/ldb.h"
 #include "registry/registry.h"
 #include "smb.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "ntptr/ntptr.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/smbd/service.h b/source4/smbd/service.h
new file mode 100644
index 0000000000..3ccd98d7a9
--- /dev/null
+++ b/source4/smbd/service.h
@@ -0,0 +1,31 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   SERVER SERVICE code
+
+   Copyright (C) Andrew Tridgell 2003-2005
+   Copyright (C) Stefan (metze) Metzmacher	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.
+*/
+
+#ifndef __SERVICE_H__
+#define __SERVICE_H__
+
+#include "smbd/service_stream.h"
+#include "smbd/service_task.h"
+#include "smbd/service_proto.h"
+
+#endif /* __SERVICE_H__ */
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index 6f1a967237..692e18bea5 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -21,6 +21,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __SERVICE_STREAM_H__
+#define __SERVICE_STREAM_H__
+
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
  * with a comment and maybe update struct stream_connection_critical_sizes.
@@ -58,3 +61,5 @@ struct stream_server_ops {
 	void (*recv_handler)(struct stream_connection *, uint16_t);
 	void (*send_handler)(struct stream_connection *, uint16_t);
 };
+
+#endif /* __SERVICE_STREAM_H__ */
diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h
index 84bb512455..c0adf08fd0 100644
--- a/source4/smbd/service_task.h
+++ b/source4/smbd/service_task.h
@@ -20,6 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __SERVICE_TASK_H__
+#define __SERVICE_TASK_H__ 
 
 struct task_server {
 	struct event_context *event_ctx;
@@ -29,3 +31,4 @@ struct task_server {
 	void *private;
 };
 
+#endif /* __SERVICE_TASK_H__ */