tmpl: Move NUM constants into the tmpl header

FreeRADIUS · May 14, 2020 · a1a9607 · a1a9607
1 parent db52de9
commit a1a9607
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
@@ -177,6 +177,10 @@ typedef struct vp_tmpl_rules_s vp_tmpl_rules_t;
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/regex.h>
 
+#define NUM_ANY			INT16_MIN
+#define NUM_ALL			(INT16_MIN + 1)
+#define NUM_COUNT		(INT16_MIN + 2)
+#define NUM_LAST		(INT16_MIN + 3)
 /** A source or sink of value data.
  *
  * Is used as both the RHS and LHS of a map (both update, and conditional types)

diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
@@ -196,11 +196,6 @@ typedef struct {
 #define ATTR_TAG_MATCH(_a, _t) (!_a->da->flags.has_tag || TAG_EQ(_t, _a->tag))
 #define ATTRIBUTE_EQ(_x, _y) ((_x && _y) && (_x->da == _y->da) && (!_x->da->flags.has_tag || TAG_EQ(_x->tag, _y->tag)))
 
-#define NUM_ANY			INT_MIN
-#define NUM_ALL			(INT_MIN + 1)
-#define NUM_COUNT		(INT_MIN + 2)
-#define NUM_LAST		(INT_MIN + 3)
-
 #  ifdef WITH_VERIFY_PTR
 void		fr_pair_verify(char const *file, int line, VALUE_PAIR const *vp);
 void		fr_pair_list_verify(char const *file, int line, TALLOC_CTX const *expected, VALUE_PAIR *vps);