summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-03-30 19:28:18 -0400
committerCorey Farrell <git@cfware.com>2017-03-30 22:59:59 -0500
commitf9695dc0578484a58cca7bec71810cf7440983d8 (patch)
treeedbb8f597be77d6f88a0fb925753b060c026715e /include/asterisk/channel.h
parent0a06d3971603e69eae081e6acbedc63c6070eb0c (diff)
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
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 391e58ccf..32c9c7f67 100644
--- 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