From 71117b40b668596625154898e3d88d1f4e98eef2 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 11 Dec 2016 16:29:56 +0100 Subject: [PATCH] formatting --- src/ebusd/bushandler.cpp | 4 +++- src/ebusd/network.cpp | 4 ++-- src/lib/ebus/contrib/tem.cpp | 2 +- src/lib/ebus/data.cpp | 2 +- src/lib/ebus/datatype.cpp | 4 ++-- src/lib/ebus/device.cpp | 4 ++-- src/lib/utils/rotatefile.cpp | 4 ---- src/lib/utils/thread.cpp | 2 +- src/tools/ebusctl.cpp | 4 ++-- src/tools/ebusfeed.cpp | 2 +- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp index 32663c7b..2752a229 100644 --- a/src/ebusd/bushandler.cpp +++ b/src/ebusd/bushandler.cpp @@ -22,7 +22,9 @@ #include "result.h" #include "symbol.h" #include "log.h" -#include "config.h" +#ifdef HAVE_CONFIG_H +# include +#endif #include #include #include diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp index 092fe164..497766cd 100644 --- a/src/ebusd/network.cpp +++ b/src/ebusd/network.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "network.h" @@ -25,7 +25,7 @@ #include #ifdef HAVE_PPOLL -#include +# include #endif using namespace std; diff --git a/src/lib/ebus/contrib/tem.cpp b/src/lib/ebus/contrib/tem.cpp index 2b8eeac2..eae90640 100644 --- a/src/lib/ebus/contrib/tem.cpp +++ b/src/lib/ebus/contrib/tem.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "datatype.h" diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index aab820ab..9b7f5485 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "data.h" diff --git a/src/lib/ebus/datatype.cpp b/src/lib/ebus/datatype.cpp index ed8339b9..686d173b 100644 --- a/src/lib/ebus/datatype.cpp +++ b/src/lib/ebus/datatype.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "datatype.h" @@ -30,7 +30,7 @@ #include #ifdef HAVE_CONTRIB -#include "contrib/contrib.h" +# include "contrib/contrib.h" #endif using namespace std; diff --git a/src/lib/ebus/device.cpp b/src/lib/ebus/device.cpp index 4ef6813f..747e50e1 100644 --- a/src/lib/ebus/device.cpp +++ b/src/lib/ebus/device.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "device.h" @@ -34,7 +34,7 @@ #include #ifdef HAVE_PPOLL -#include +# include #endif using namespace std; diff --git a/src/lib/utils/rotatefile.cpp b/src/lib/utils/rotatefile.cpp index bd391150..fd2272c6 100644 --- a/src/lib/utils/rotatefile.cpp +++ b/src/lib/utils/rotatefile.cpp @@ -16,10 +16,6 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -#include -#endif - #include "rotatefile.h" #include "clock.h" #include diff --git a/src/lib/utils/thread.cpp b/src/lib/utils/thread.cpp index a2d69543..3fd12a73 100644 --- a/src/lib/utils/thread.cpp +++ b/src/lib/utils/thread.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "thread.h" diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp index 41182dfd..368a397d 100644 --- a/src/tools/ebusctl.cpp +++ b/src/tools/ebusctl.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -29,7 +29,7 @@ #include #ifdef HAVE_PPOLL -#include +# include #endif using namespace std; diff --git a/src/tools/ebusfeed.cpp b/src/tools/ebusfeed.cpp index 29af9a76..2090b91c 100644 --- a/src/tools/ebusfeed.cpp +++ b/src/tools/ebusfeed.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include