Forward declare 'struct ast_json' in asterisk.h
authorCorey Farrell <git@cfware.com>
Thu, 30 Mar 2017 23:28:18 +0000 (19:28 -0400)
committerCorey Farrell <git@cfware.com>
Fri, 31 Mar 2017 03:59:59 +0000 (22:59 -0500)
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

include/asterisk.h
include/asterisk/channel.h
include/asterisk/stasis_app.h
include/asterisk/stasis_channels.h
include/asterisk/stasis_endpoints.h
include/asterisk/stasis_system.h

index 862fa1f..dc530df 100644 (file)
@@ -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
index 391e58c..32c9c7f 100644 (file)
@@ -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
index e131833..ca5c251 100644 (file)
@@ -51,7 +51,6 @@
  */
 
 #include "asterisk/channel.h"
-#include "asterisk/json.h"
 
 /*! @{ */
 
index deb79b0..4843617 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "asterisk/stringfields.h"
 #include "asterisk/stasis.h"
-#include "asterisk/json.h"
 #include "asterisk/channel.h"
 
 /*! \addtogroup StasisTopicsAndMessages
index 539f270..2fbe5f4 100644 (file)
@@ -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"
index 274c02e..5595906 100644 (file)
@@ -19,7 +19,6 @@
 #ifndef _ASTERISK_STASIS_SYSTEM_H
 #define _ASTERISK_STASIS_SYSTEM_H
 
-#include "asterisk/json.h"
 #include "asterisk/stasis.h"
 
 /*!