From 0bd2756b974f171eb837d30309e2a46915edd861 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 21 Sep 2010 08:37:14 +0200
Subject: s3:registry: move prototypes from reg_init_basic.c to their own
 header.

---
 source3/include/registry.h          |  5 -----
 source3/libgpo/gpo_reg.c            |  1 +
 source3/registry/reg_init_basic.c   |  1 +
 source3/registry/reg_init_basic.h   | 26 ++++++++++++++++++++++++++
 source3/registry/reg_init_full.c    |  1 +
 source3/registry/reg_init_smbconf.c |  1 +
 source3/utils/net_registry.c        |  1 +
 7 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 source3/registry/reg_init_basic.h

(limited to 'source3')

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 09a8333eb3..03b4a5c3cc 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -130,11 +130,6 @@ struct registry_key {
 #define REG_KEY_HKPT		2
 
 
-/* The following definitions come from registry/reg_init_basic.c  */
-
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
-
 /* The following definitions come from registry/reg_init_full.c  */
 
 WERROR registry_init_full(void);
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 851fddcf20..83f7e8de78 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -24,6 +24,7 @@
 #include "registry/reg_api.h"
 #include "registry/reg_backend_db.h"
 #include "registry/reg_api_util.h"
+#include "registry/reg_init_basic.h"
 
 
 /****************************************************************
diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 097be39b33..ea8077fc14 100644
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_init_basic.h"
 #include "reg_cachehook.h"
 #include "reg_backend_db.h"
 
diff --git a/source3/registry/reg_init_basic.h b/source3/registry/reg_init_basic.h
new file mode 100644
index 0000000000..4149b5d68a
--- /dev/null
+++ b/source3/registry/reg_init_basic.h
@@ -0,0 +1,26 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Registry helper routines
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _REG_INIT_BASIC_H
+#define _REG_INIT_BASIC_H
+
+WERROR registry_init_common(void);
+WERROR registry_init_basic(void);
+
+#endif /* _REG_INIT_BASIC_H */
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index c99d974f55..e17bc413c2 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -26,6 +26,7 @@
 #include "reg_backend_db.h"
 #include "reg_perfcount.h"
 #include "reg_eventlog.h"
+#include "reg_init_basic.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index f811049557..e2024df8b5 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -21,6 +21,7 @@
 #include "registry.h"
 #include "reg_cachehook.h"
 #include "reg_backend_db.h"
+#include "reg_init_basic.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 751972515f..9b3f561d8d 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -23,6 +23,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "registry/reg_util_token.h"
+#include "registry/reg_init_basic.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"
 #include "include/g_lock.h"
-- 
cgit