diff --git a/daemon/src/account.h b/daemon/src/account.h index 6ebb7bd517e90aa91012de05a4aa5a75f4b5712e..080f544ad80def92891488051c72889def2e6ee0 100644 --- a/daemon/src/account.h +++ b/daemon/src/account.h @@ -37,7 +37,7 @@ #include "global.h" #include "noncopyable.h" -#include "config/config.h" +#include "config/sfl_config.h" #include "config/serializable.h" class VoIPLink; diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am index 559faf36eb0b8ad9a4b462822f0bea7ab6dce65b..a790afe67de424c15ce3853783bcc1c2b336d1aa 100644 --- a/daemon/src/config/Makefile.am +++ b/daemon/src/config/Makefile.am @@ -1,13 +1,13 @@ noinst_LTLIBRARIES = libconfig.la libconfig_la_SOURCES = \ - config.cpp \ + sfl_config.cpp \ yamlemitter.cpp \ yamlparser.cpp \ yamlnode.cpp noinst_HEADERS = \ - config.h \ + sfl_config.h \ serializable.h \ yamlemitter.h \ yamlparser.h \ diff --git a/daemon/src/config/config.cpp b/daemon/src/config/sfl_config.cpp similarity index 99% rename from daemon/src/config/config.cpp rename to daemon/src/config/sfl_config.cpp index c8b5fe390ff8e4f1b704f8520a5bce2f79766ecf..c7e5ac31027d9e8302107eeb30a4b7a34698900c 100644 --- a/daemon/src/config/config.cpp +++ b/daemon/src/config/sfl_config.cpp @@ -29,9 +29,7 @@ * as that of the covered work. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "sfl_config.h" #include "logger.h" #include <fstream> #include <cstdlib> @@ -324,4 +322,3 @@ ConfigTreeIterator::next() return tk; } } // end namespace ConfigTree - diff --git a/daemon/src/config/config.h b/daemon/src/config/sfl_config.h similarity index 100% rename from daemon/src/config/config.h rename to daemon/src/config/sfl_config.h diff --git a/daemon/src/config/yamlparser.cpp b/daemon/src/config/yamlparser.cpp index 97b0c18b71518f82f0381653521940650d5951dc..2dd58cfc3b1b0b98681a72694dbbae0d08a6257d 100644 --- a/daemon/src/config/yamlparser.cpp +++ b/daemon/src/config/yamlparser.cpp @@ -31,7 +31,7 @@ #include "yamlparser.h" #include "../global.h" -#include "config.h" +#include "sfl_config.h" #include "yamlnode.h" #include <cstdio> diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h index eafec01c49410e0afcaffedde8f17154d22e5caf..b7447e02fbe656e7f8ad5a90daa6369c83905723 100644 --- a/daemon/src/managerimpl.h +++ b/daemon/src/managerimpl.h @@ -43,7 +43,7 @@ #include "cc_thread.h" #include "dbus/dbusmanager.h" -#include "config/config.h" +#include "config/sfl_config.h" #include "call.h" #include "conference.h" diff --git a/daemon/test/echocanceltest.cpp b/daemon/test/echocanceltest.cpp index bc76b80eefb8002990cbb391387f517714f29e36..c872003641eb081dd9d4cb8972f2427eaa511b43 100644 --- a/daemon/test/echocanceltest.cpp +++ b/daemon/test/echocanceltest.cpp @@ -31,7 +31,7 @@ #include <iostream> #include "echocanceltest.h" -#include "config/config.h" +#include "config/sfl_config.h" EchoCancelTest::EchoCancelTest() : echoCanceller_() {} diff --git a/daemon/test/gaincontroltest.cpp b/daemon/test/gaincontroltest.cpp index 89a936cd350b5960c0d4bd62fd5f7d6811c87a62..ed5492099b141bf04b61b8be2fb8b6d966f8f3b0 100644 --- a/daemon/test/gaincontroltest.cpp +++ b/daemon/test/gaincontroltest.cpp @@ -30,7 +30,7 @@ #include "gaincontroltest.h" #include "audio/gaincontrol.h" -#include "config/config.h" +#include "config/sfl_config.h" void GainControlTest::testGainProcessing() {