From: Margaret Wasserman <mrw@painless-security.com>
Date: Mon, 24 Mar 2014 22:20:47 +0000 (-0400)
Subject: Remove need for remote def of TR_FLINE that won't compile on Centos.
X-Git-Tag: 1.3.1~41
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=f7a48723f8e2562e48ac77e3de4aa3b112343a63

Remove need for remote def of TR_FLINE that won't compile on Centos.
---

diff --git a/include/tr_filter.h b/include/tr_filter.h
index b744c9b..8efdbc4 100644
--- a/include/tr_filter.h
+++ b/include/tr_filter.h
@@ -75,4 +75,5 @@ typedef struct tr_filter {
 void tr_filter_free (TR_FILTER *filt);
 int tr_prefix_wildcard_match (char *str, char *wc_str);
 int tr_filter_process_rp_permitted (TR_NAME *rp_realm, TR_FILTER *rpp_filter, TR_CONSTRAINT_SET *in_constraints, TR_CONSTRAINT_SET **out_constraints, int *out_action);
+TR_CONSTRAINT_SET *tr_constraint_set_from_fline (TR_FLINE *fline);
 #endif
diff --git a/include/trust_router/tr_constraint.h b/include/trust_router/tr_constraint.h
index deeed51..fc20ae0 100644
--- a/include/trust_router/tr_constraint.h
+++ b/include/trust_router/tr_constraint.h
@@ -39,7 +39,6 @@
 
 #define TR_MAX_CONST_MATCHES 24
 
-typedef struct tr_fline TR_FLINE;
 typedef void TR_CONSTRAINT_SET;
 
 typedef struct tr_constraint {
@@ -47,7 +46,6 @@ typedef struct tr_constraint {
   TR_NAME *matches[TR_MAX_CONST_MATCHES];
 } TR_CONSTRAINT;
 
-TR_CONSTRAINT_SET *tr_constraint_set_from_fline (TR_FLINE *fline);
 void tr_constraint_add_to_set (TR_CONSTRAINT_SET **cs, TR_CONSTRAINT *c);
 
 #endif