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 f3f8b3a038847c09e8b7b7bc8cfc3b6ebc2bdae7..4fc070b011e6ec59aaa25734d0aa8cdd06fe1cd2 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -275,6 +275,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 a57a0b4cbe65e7eccb8f52ba4f286c58bf30294f..a2c42775a55a33937dd54ef0b1d7e9816eb81d5c 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"
 
 /*!