@@ -227,7 +227,7 @@ static int cli_bytecode_context_reset(struct cli_bc_ctx *ctx)

     ctx->nmaps = 0;

 #if HAVE_JSON

-    free(ctx->jsonobjs);

+    free((json_object**)(ctx->jsonobjs));

     ctx->jsonobjs = NULL;

     ctx->njsonobjs = 0;

 #endif

@@ -1547,10 +1547,10 @@ int32_t cli_bcapi_json_is_active(struct cli_bc_ctx *ctx )

 static int32_t cli_bcapi_json_objs_init(struct cli_bc_ctx *ctx) {

 #if HAVE_JSON 

     unsigned n = ctx->njsonobjs + 1;

-    json_object **j;

+    json_object **j, jobjs = (json_object**)(ctx->jsonobjs);

     cli_ctx *cctx = (cli_ctx *)ctx->ctx;

-    j = cli_realloc(ctx->jsonobjs, sizeof(*ctx->jsonobjs)*n);

+    j = cli_realloc(jobjs, sizeof(*jobjs)*n);

     if (!j) { /* memory allocation failure */

         cli_event_error_oom(EV, 0);

         return -1;

@@ -1578,7 +1578,7 @@ int32_t cli_bcapi_json_get_object(struct cli_bc_ctx *ctx, const int8_t* name, in

 {

 #if HAVE_JSON

     unsigned n;

-    json_object **j, *jobj;

+    json_object **j, *jobj, **jobjs = (json_object**)(ctx->jsonobjs);

     char *namep;

     INIT_JSON_OBJS(ctx);

@@ -1593,7 +1593,7 @@ int32_t cli_bcapi_json_get_object(struct cli_bc_ctx *ctx, const int8_t* name, in

     }

     n = ctx->njsonobjs + 1;

-    jobj = ctx->jsonobjs[objid];

+    jobj = jobjs[objid];

     if (!jobj) /* shouldn't be possible */

         return -1;

     namep = (char*)cli_malloc(sizeof(char)*(name_len+1));

@@ -1608,7 +1608,7 @@ int32_t cli_bcapi_json_get_object(struct cli_bc_ctx *ctx, const int8_t* name, in

         return 0;

     }

-    j = cli_realloc(ctx->jsonobjs, sizeof(*ctx->jsonobjs)*n);

+    j = cli_realloc(jobjs, sizeof(*jobjs)*n);

     if (!j) { /* memory allocation failure */

         free(namep);

         cli_event_error_oom(EV, 0);

@@ -1631,6 +1631,7 @@ int32_t cli_bcapi_json_get_type(struct cli_bc_ctx *ctx, int32_t objid)

 {

 #if HAVE_JSON

     enum json_type type;

+    json_object **jobjs = (json_object**)(ctx->jsonobjs);

     INIT_JSON_OBJS(ctx);

     if (objid < 0 || objid >= ctx->njsonobjs) {

@@ -1638,7 +1639,7 @@ int32_t cli_bcapi_json_get_type(struct cli_bc_ctx *ctx, int32_t objid)

         return -1;

     }

-    type = json_object_get_type(ctx->jsonobjs[objid]);

+    type = json_object_get_type(jobjs[objid]);

     switch (type) {

     case json_type_null:

         return JSON_TYPE_NULL;

@@ -1668,6 +1669,7 @@ int32_t cli_bcapi_json_get_array_length(struct cli_bc_ctx *ctx, int32_t objid)

 {

 #if HAVE_JSON

     enum json_type type;

+    json_object **jobjs = (json_object**)(ctx->jsonobjs);

     INIT_JSON_OBJS(ctx);

     if (objid < 0 || objid >= ctx->njsonobjs) {

@@ -1675,12 +1677,12 @@ int32_t cli_bcapi_json_get_array_length(struct cli_bc_ctx *ctx, int32_t objid)

         return -1;

     }

-    type = json_object_get_type(ctx->jsonobjs[objid]);

+    type = json_object_get_type(jobjs[objid]);

     if (type != json_type_array) {

         return -2; /* error code for not an array */

     }

-    return json_object_array_length(ctx->jsonobjs[objid]);

+    return json_object_array_length(jobjs[objid]);

 #else

     cli_dbgmsg("bytecode api: libjson is not enabled!\n");

     return -1;

@@ -1693,7 +1695,7 @@ int32_t cli_bcapi_json_get_array_idx(struct cli_bc_ctx *ctx, int32_t idx, int32_

     enum json_type type;

     unsigned n;

     int length;

-    json_object **j, *jarr = NULL, *jobj = NULL;

+    json_object **j, *jarr = NULL, *jobj = NULL, **jobjs = (json_object**)(ctx->jsonobjs);

     INIT_JSON_OBJS(ctx);

     if (objid < 0 || objid >= ctx->njsonobjs) {

@@ -1701,7 +1703,7 @@ int32_t cli_bcapi_json_get_array_idx(struct cli_bc_ctx *ctx, int32_t idx, int32_

         return -1;

     }

-    jarr = ctx->jsonobjs[objid];

+    jarr = jobjs[objid];

     if (!jarr) /* shouldn't be possible */

         return -1;

@@ -1719,7 +1721,7 @@ int32_t cli_bcapi_json_get_array_idx(struct cli_bc_ctx *ctx, int32_t idx, int32_

             return 0;

         }

-        j = cli_realloc(ctx->jsonobjs, sizeof(*ctx->jsonobjs)*n);

+        j = cli_realloc(jobjs, sizeof(*jobjs)*n);

         if (!j) { /* memory allocation failure */

             cli_event_error_oom(EV, 0);

             return -1;

@@ -1743,7 +1745,7 @@ int32_t cli_bcapi_json_get_string_length(struct cli_bc_ctx *ctx, int32_t objid)

 {

 #if HAVE_JSON

     enum json_type type;

-    json_object *jobj;

+    json_object *jobj, **jobjs = (json_object**)(ctx->jsonobjs);

     int32_t len;

     const char *jstr;

@@ -1753,7 +1755,7 @@ int32_t cli_bcapi_json_get_string_length(struct cli_bc_ctx *ctx, int32_t objid)

         return -1;

     }

-    jobj = ctx->jsonobjs[objid];

+    jobj = jobjs[objid];

     if (!jobj) /* shouldn't be possible */

         return -1;

@@ -1777,7 +1779,7 @@ int32_t cli_bcapi_json_get_string(struct cli_bc_ctx *ctx, int8_t* str, int32_t s

 {

 #if HAVE_JSON

     enum json_type type;

-    json_object *jobj;

+    json_object *jobj, **jobjs = (json_object**)(ctx->jsonobjs);

     int32_t len;

     const char *jstr;

@@ -1787,7 +1789,7 @@ int32_t cli_bcapi_json_get_string(struct cli_bc_ctx *ctx, int8_t* str, int32_t s

         return -1;

     }

-    jobj = ctx->jsonobjs[objid];

+    jobj = jobjs[objid];

     if (!jobj) /* shouldn't be possible */

         return -1;

@@ -1821,7 +1823,7 @@ int32_t cli_bcapi_json_get_string(struct cli_bc_ctx *ctx, int8_t* str, int32_t s

 int32_t cli_bcapi_json_get_boolean(struct cli_bc_ctx *ctx, int32_t objid)

 {

 #if HAVE_JSON

-    json_object *jobj;

+    json_object *jobj, **jobjs = (json_object**)(ctx->jsonobjs);

     INIT_JSON_OBJS(ctx);

     if (objid < 0 || objid >= ctx->njsonobjs) {

@@ -1829,7 +1831,7 @@ int32_t cli_bcapi_json_get_boolean(struct cli_bc_ctx *ctx, int32_t objid)

         return -1;

     }

-    jobj = ctx->jsonobjs[objid];

+    jobj = jobjs[objid];

     return json_object_get_boolean(jobj);

 #else

     cli_dbgmsg("bytecode api: libjson is not enabled!\n");

@@ -1840,7 +1842,7 @@ int32_t cli_bcapi_json_get_boolean(struct cli_bc_ctx *ctx, int32_t objid)

 int32_t cli_bcapi_json_get_int(struct cli_bc_ctx *ctx, int32_t objid)

 {

 #if HAVE_JSON

-    json_object *jobj;

+    json_object *jobj, **jobjs = (json_object**)(ctx->jsonobjs);

     INIT_JSON_OBJS(ctx);

     if (objid < 0 || objid >= ctx->njsonobjs) {

@@ -1848,7 +1850,7 @@ int32_t cli_bcapi_json_get_int(struct cli_bc_ctx *ctx, int32_t objid)

         return -1;

     }

-    jobj = ctx->jsonobjs[objid];

+    jobj = jobjs[objid];

     return json_object_get_int(jobj);

 #else

     cli_dbgmsg("bytecode api: libjson is not enabled!\n");

@@ -32,9 +32,6 @@

 #include "mpool.h"

 #include "hashtab.h"

 #include "events.h"

-#if HAVE_JSON

-#include "json.h"

-#endif

 typedef uint32_t operand_t;

 typedef uint16_t bbid_t;

@@ -231,7 +228,7 @@ struct cli_bc_ctx {

     int on_jit;

     int no_diff;

 #if HAVE_JSON

-    json_object **jsonobjs;

+    void **jsonobjs;

     unsigned njsonobjs;

 #endif

 };