[PATCH BlueZ] mesh: Clean up includes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This adds #include for json-c/json.h in mesh-db.h and removes this
include from the other files that don't need to reference json-c.
---
 mesh/cfgmod-server.c | 2 --
 mesh/mesh-db.c       | 1 -
 mesh/mesh-db.h       | 2 ++
 mesh/model.c         | 2 --
 mesh/node.c          | 1 -
 mesh/storage.c       | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 060d7f4e4..2f61d841c 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -24,8 +24,6 @@
 #include <sys/time.h>
 #include <ell/ell.h>
 
-#include "json-c/json.h"
-
 #include "mesh/mesh-defs.h"
 #include "mesh/node.h"
 #include "mesh/net.h"
diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c
index e0a000261..f3807070f 100644
--- a/mesh/mesh-db.c
+++ b/mesh/mesh-db.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <ell/ell.h>
-#include <json-c/json.h>
 
 #include "mesh/mesh-defs.h"
 #include "mesh/util.h"
diff --git a/mesh/mesh-db.h b/mesh/mesh-db.h
index da5efa12a..8fb0eb291 100644
--- a/mesh/mesh-db.h
+++ b/mesh/mesh-db.h
@@ -17,6 +17,8 @@
  *
  */
 
+#include <json-c/json.h>
+
 struct mesh_db_sub {
 	bool virt;
 	union {
diff --git a/mesh/model.c b/mesh/model.c
index f29ad9af2..4b5605af6 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -23,10 +23,8 @@
 
 #include <sys/time.h>
 #include <ell/ell.h>
-#include <json-c/json.h>
 
 #include "mesh/mesh-defs.h"
-
 #include "mesh/mesh.h"
 #include "mesh/crypto.h"
 #include "mesh/node.h"
diff --git a/mesh/node.c b/mesh/node.c
index e99858623..c8d0fac2e 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 
 #include <ell/ell.h>
-#include <json-c/json.h>
 
 #include "mesh/mesh-defs.h"
 #include "mesh/mesh.h"
diff --git a/mesh/storage.c b/mesh/storage.c
index 1a9945aa8..6cb280c39 100644
--- a/mesh/storage.c
+++ b/mesh/storage.c
@@ -30,7 +30,6 @@
 #include <libgen.h>
 #include <ftw.h>
 
-#include <json-c/json.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
-- 
2.21.0




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux