Provide necessary macros from Jansson 2.5+ when using old versions

diff --git a/common/t_constraint.c b/common/t_constraint.c
index 997abaf..cb7549d 100644 (file)
--- a/common/t_constraint.c
+++ b/common/t_constraint.c
@@ -33,7 +33,9 @@
  */
 
 #include <jansson.h>
+#if JANSSON_VERSION_HEX < 0x020500
 #include "jansson_iterators.h"
+#endif
 #include <stdio.h>
 #include <assert.h>
 

diff --git a/common/tests/filt_test.c b/common/tests/filt_test.c
index 00caf48..e86f1bb 100644 (file)
--- a/common/tests/filt_test.c
+++ b/common/tests/filt_test.c
@@ -37,7 +37,9 @@
 #include <assert.h>
 #include <string.h>
 #include <jansson.h>
-
+#if JANSSON_VERSION_HEX < 0x020500
+#include "../jansson_iterators.h"
+#endif
 #include <trp_internal.h>
 #include <tid_internal.h>
 #include <tr_filter.h>
@@ -267,4 +269,4 @@ int main(void)
   assert(test_filter());
   printf("Success\n");
   return 0;
-}
\ No newline at end of file
+}

diff --git a/common/tr_config.c b/common/tr_config.c
index e98061f..c597bff 100644 (file)
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -49,6 +49,10 @@
 #include <tr.h>
 #include <trust_router/trp.h>
 
+#if JANSSON_VERSION_HEX < 0x020500
+#include "jansson_iterators.h"
+#endif
+
 void tr_print_config (TR_CFG *cfg) {
   tr_notice("tr_print_config: Logging running trust router configuration.");
   tr_print_comms(cfg->ctable);

diff --git a/common/tr_constraint.c b/common/tr_constraint.c
index 0a507c2..da5f42e 100644 (file)
--- a/common/tr_constraint.c
+++ b/common/tr_constraint.c
@@ -32,7 +32,9 @@
  *
  */
 #include <jansson.h>
+#if JANSSON_VERSION_HEX < 0x020500
 #include "jansson_iterators.h"
+#endif
 #include <assert.h>
 #include <talloc.h>