Remove API dependency on jansson for constraints.

diff --git a/common/tr_constraint.c b/common/tr_constraint.c
index aa3d4fc..3ce6cbe 100644 (file)
--- a/common/tr_constraint.c
+++ b/common/tr_constraint.c
@@ -44,9 +44,9 @@ TR_CONSTRAINT_SET *tr_constraint_set_from_fline (TR_FLINE *fline)
     return NULL;
 
   if (fline->realm_cons)
-    tr_constraint_add_to_set(&cset, fline->realm_cons);
+    tr_constraint_add_to_set((TR_CONSTRAINT_SET **)&cset, fline->realm_cons);
   if (fline->domain_cons)
-    tr_constraint_add_to_set(&cset, fline->domain_cons);
+    tr_constraint_add_to_set((TR_CONSTRAINT_SET **)&cset, fline->domain_cons);
   
    return cset;
 }

diff --git a/include/trust_router/tr_constraint.h b/include/trust_router/tr_constraint.h
index d740a3a..deeed51 100644 (file)
--- a/include/trust_router/tr_constraint.h
+++ b/include/trust_router/tr_constraint.h
@@ -36,12 +36,11 @@
 #define TR_CONSTRAINT_H
 
 #include <trust_router/tr_name.h>
-#include <jansson.h>
 
 #define TR_MAX_CONST_MATCHES 24
 
 typedef struct tr_fline TR_FLINE;
-typedef json_t TR_CONSTRAINT_SET;
+typedef void TR_CONSTRAINT_SET;
 
 typedef struct tr_constraint {
   TR_NAME *type;