diff --git a/corosync.spec.in b/corosync.spec.in index 7f084f18..a9302c98 100644 --- a/corosync.spec.in +++ b/corosync.spec.in @@ -272,7 +272,7 @@ The Corosync Cluster Engine APIs. %{_includedir}/corosync/totem/totemip.h %{_includedir}/corosync/totem/totempg.h %dir %{_includedir}/corosync/engine -%{_includedir}/corosync/engine/config.h +%{_includedir}/corosync/engine/icmap.h %{_includedir}/corosync/engine/quorum.h %{_libdir}/libcfg.so %{_libdir}/libcpg.so diff --git a/exec/coroparse.c b/exec/coroparse.c index 1de940a2..6f0c7665 100644 --- a/exec/coroparse.c +++ b/exec/coroparse.c @@ -58,8 +58,7 @@ #include #define LOGSYS_UTILS_ONLY 1 #include -#include -#include +#include #include "main.h" #include "util.h" diff --git a/exec/main.c b/exec/main.c index da72b796..473be0a3 100644 --- a/exec/main.c +++ b/exec/main.c @@ -106,7 +106,6 @@ #include #include #include -#include #include #include diff --git a/exec/main.h b/exec/main.h index 6cbbeb42..67fd80b5 100644 --- a/exec/main.h +++ b/exec/main.h @@ -48,13 +48,10 @@ #include #include #include -#include #include extern unsigned long long *(*main_clm_get_by_nodeid) (unsigned int node_id); -extern void main_get_config_modules(struct config_iface_ver0 ***modules, int *num); - extern int main_mcast ( const struct iovec *iovec, unsigned int iov_len, diff --git a/include/Makefile.am b/include/Makefile.am index b08341f9..11ed1e1d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -39,7 +39,7 @@ CS_INTERNAL_H = ipc_cfg.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h \ jhash.h pload.h quorum.h sq.h ipc_votequorum.h ipc_cmap.h \ logsys.h coroapi.h icmap.h -ENGINE_H = config.h quorum.h +ENGINE_H = quorum.h TOTEM_H = totem.h totemip.h totempg.h diff --git a/include/corosync/engine/config.h b/include/corosync/engine/config.h deleted file mode 100644 index e6f76868..00000000 --- a/include/corosync/engine/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2006 Red Hat, Inc. - * - * All rights reserved. - * - * Author: Patrick Caulfield (pcaulfie@redhat.com) - * - * This software licensed under BSD license, the text of which follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - Neither the name of the MontaVista Software, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef CONFIG_H_DEFINED -#define CONFIG_H_DEFINED - -struct config_iface_ver0 { - int (*config_readconfig) (const char **error_string); - int (*config_writeconfig) (const char **error_string); - int (*config_reloadconfig) (int flush, const char **error_string); -}; - - - -#endif /* CONFIG_H_DEFINED */