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 041f177e6f61bd53063c6620ceb62b384367f663..39c7ae894a1f040e042a3eb19d0a63fa45f481f0 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -317,6 +317,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 c237a009f0a15d210975e9e6a7f916253a44e160..5765e7567cb4934b7cd24cdde7c22f1b3368ddae 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 6f9897c09e85e89689709f72c558d31a5bfda874..90a7ea32b329811d3d9c60cbde53cbb2ce2558c0 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 6c6cd51f129d528db5ac1dac6df325ea37b79b33..fec451fa024ac6c37a9460309f9d350bc2242f4b 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"
 
 /*!