Sync with upstream 2011-06-03/5669ec08b530b9bbed5848ec414f8c029e41ab02

[privoxy.git] / filters.h

diff --git a/filters.h b/filters.h
index 2faa227..b0374ce 100644 (file)
--- a/filters.h
+++ b/filters.h
@@ -1,6 +1,6 @@
 #ifndef FILTERS_H_INCLUDED
 #define FILTERS_H_INCLUDED
-#define FILTERS_H_VERSION "$Id: filters.h,v 1.38 2010/05/01 18:20:50 fabiankeil Exp $"
+#define FILTERS_H_VERSION "$Id: filters.h,v 1.41 2010/09/14 07:16:07 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.h,v $
@@ -101,17 +101,14 @@ extern const struct forward_spec *forward_url(struct client_state *csp,
 /*
  * Content modification
  */
-
-typedef char *(*filter_function_ptr)();
 extern char *execute_content_filters(struct client_state *csp);
-
-extern filter_function_ptr get_filter_function(struct client_state *csp);
 extern char *execute_single_pcrs_command(char *subject, const char *pcrs_command, int *hits);
 extern char *rewrite_url(char *old_url, const char *pcrs_command);
 extern char *get_last_url(char *subject, const char *redirect_mode);
 
 extern pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const struct re_filterfile_spec *b);
 
+extern int content_requires_filtering(struct client_state *csp);
 extern int content_filters_enabled(const struct current_action_spec *action);
 extern int filters_available(const struct client_state *csp);
 
@@ -120,14 +117,6 @@ extern int filters_available(const struct client_state *csp);
  */
 extern struct http_response *direct_response(struct client_state *csp);
 
-
-/*
- * Solaris fix:
- */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1
-#endif     
-
 /* 
  * Revision control strings from this header and associated .c file
  */