Update FSF address

[lttv.git] / lttv / lttv / filter.h

diff --git a/lttv/lttv/filter.h b/lttv/lttv/filter.h
index 1bbd5f518f0acc98af6c0ab846e6524772e4f9de..452765dc0e36a49ec49876a53fbd82b5303c6e92 100644 (file)
--- a/lttv/lttv/filter.h
+++ b/lttv/lttv/filter.h
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 #ifndef FILTER_H
@@ -47,12 +47,9 @@
 
 
 #include <lttv/traceset.h>
-#include <lttv/tracecontext.h>
+#include <lttv/traceset-process.h>
 #include <lttv/state.h>
 #include <lttv/module.h>
-#include <ltt/ltt.h>
-#include <ltt/time.h>
-#include <ltt/event.h>
 
 /* structures prototypes */
 typedef enum _LttvStructType LttvStructType; 
@@ -104,7 +101,6 @@ enum _LttvFieldType {
        LTTV_FILTER_STATE_CT,           /**< state.creation_time (double) */
        LTTV_FILTER_STATE_IT,           /**< state.insertion_time (double) */
        LTTV_FILTER_STATE_P_NAME,       /**< state.process_name (char*) */
-       LTTV_FILTER_STATE_T_BRAND,      /**< state.thread_brand (char*) */
        LTTV_FILTER_STATE_EX_MODE,      /**< state.execution_mode (LttvExecutionMode) */
        LTTV_FILTER_STATE_EX_SUBMODE,   /**< state.execution_submode (LttvExecutionSubmode) */
        LTTV_FILTER_STATE_P_STATUS,     /**< state.process_status (LttvProcessStatus) */
@@ -344,24 +340,22 @@ void lttv_filter_clear_expression(LttvFilter* filter);
 LttvFilterTree* lttv_filter_tree_new();
 
 void lttv_filter_tree_destroy(LttvFilterTree* tree);
-
+#ifdef BABEL_CLEANUP
 gboolean lttv_filter_tree_parse(
                const LttvFilterTree* t,
                const LttEvent* event,
                const LttTracefile* tracefile,
                const LttTrace* trace,
-               const LttvTracefileContext* context,
                const LttvProcessState* pstate,
-               const LttvTraceContext* tc);
+               const LttvTrace* tracev);
 
 gboolean lttv_filter_tree_parse_branch(
                const LttvSimpleExpression* se,
                const LttEvent* event,
                const LttTracefile* tracefile,
                const LttTrace* trace,
-               const LttvProcessState* state,
-               const LttvTracefileContext* context);
-
+               const LttvProcessState* state);
+#endif
 /*
  *  Debug functions
  */