* #10094: renamed config/config.{h,cpp} config/sfl_config.{h,cpp}

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;

daemon/src/config/Makefile.am

 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 \

daemon/src/config/config.cpp → 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
-

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>
 

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"

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_() {}
 

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()
 {