Forward declare 'struct ast_json' in asterisk.h

The ast_json structure is used in many Asterisk headers and is often the
only part of json.h used.  This adds a forward declaration to asterisk.h
and removes the include of json.h from many headers.  The declaration
has been left in endpoints.h and stasis.h to avoid problems with source
files that use ast_json functions without directly including json.h.

ari.h continues to include json.h as it uses enum
ast_json_encoding_format.

Change-Id: Id766aabce6bed56626d27e8d29f559b5e687b769

diff --git a/include/asterisk.h b/include/asterisk.h
index 862fa1fe5f56f05dd9c03864408d7f53fb335e77..dc530dfd41a38e9441eae02e1c9d21602fb9553e 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -196,6 +196,7 @@ struct ast_module;
 struct ast_variable;
 struct ast_str;
 struct ast_sched_context;
+struct ast_json;
 
 /* Some handy macros for turning a preprocessor token into (effectively) a quoted string */
 #define __stringify_1(x)       #x

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 391e58ccf97543e2d9c5c4b81b5f221f72320af1..32c9c7f67f2d6c14fdfee55303c944e5a34733bf 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -178,7 +178,6 @@ extern "C" {
 #include "asterisk/ccss.h"
 #include "asterisk/framehook.h"
 #include "asterisk/stasis.h"
-#include "asterisk/json.h"
 #include "asterisk/endpoints.h"
 
 #define DATASTORE_INHERIT_FOREVER      INT_MAX

diff --git a/include/asterisk/stasis_app.h b/include/asterisk/stasis_app.h
index e131833a979028222b5501c4a0146dde1c51cfb1..ca5c25111cbb853ce16f912af043233e67b437b7 100644 (file)
--- a/include/asterisk/stasis_app.h
+++ b/include/asterisk/stasis_app.h
@@ -51,7 +51,6 @@
  */
 
 #include "asterisk/channel.h"
-#include "asterisk/json.h"
 
 /*! @{ */
 

diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h
index deb79b0d061111bb29117efe8cec9248bef2d11e..4843617db0c3e962af2ffa931c61ab9a9d7bffba 100644 (file)
--- a/include/asterisk/stasis_channels.h
+++ b/include/asterisk/stasis_channels.h
@@ -22,7 +22,6 @@
 
 #include "asterisk/stringfields.h"
 #include "asterisk/stasis.h"
-#include "asterisk/json.h"
 #include "asterisk/channel.h"
 
 /*! \addtogroup StasisTopicsAndMessages

diff --git a/include/asterisk/stasis_endpoints.h b/include/asterisk/stasis_endpoints.h
index 539f270cf2756ef7fb0db7676ba0c26efaaf7405..2fbe5f4b70c13be1f0cf9af7c3b438bb6c58a008 100644 (file)
--- a/include/asterisk/stasis_endpoints.h
+++ b/include/asterisk/stasis_endpoints.h
@@ -28,7 +28,6 @@
  */
 
 #include "asterisk/endpoints.h"
-#include "asterisk/json.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_cache_pattern.h"
 #include "asterisk/stringfields.h"

diff --git a/include/asterisk/stasis_system.h b/include/asterisk/stasis_system.h
index 274c02e49c8b007f816c26692777071b084211c4..55959063c7cb5f390ff096b579cf81f16ffb3473 100644 (file)
--- a/include/asterisk/stasis_system.h
+++ b/include/asterisk/stasis_system.h
@@ -19,7 +19,6 @@
 #ifndef _ASTERISK_STASIS_SYSTEM_H
 #define _ASTERISK_STASIS_SYSTEM_H
 
-#include "asterisk/json.h"
 #include "asterisk/stasis.h"
 
 /*!