X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=urlmatch.h;h=35befbddb4047a8380ed940fd4bcd84719dcfb5c;hp=cbf864dee11537d95057c859fb6e9f45dcc37e81;hb=787d77eb82da67237a757e9237f17edf234fe161;hpb=8c3e4f19001300c07cb076353eba625e4729fdd2

diff --git a/urlmatch.h b/urlmatch.h
index cbf864de..35befbdd 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -1,6 +1,6 @@
 #ifndef URLMATCH_H_INCLUDED
 #define URLMATCH_H_INCLUDED
-#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.17 2011/09/04 11:10:56 fabiankeil Exp $"
+#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.20 2013/11/24 14:23:28 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.h,v $
@@ -38,10 +38,6 @@
 
 #include "project.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void free_http_request(struct http_request *http);
 #ifndef FEATURE_EXTENDED_HOST_PATTERNS
 extern jb_err init_domain_components(struct http_request *http);
@@ -54,11 +50,11 @@ extern int url_requires_percent_encoding(const char *url);
 
 #define REQUIRE_PROTOCOL 1
 
-extern int url_match(const struct url_spec *pattern,
+extern int url_match(const struct pattern_spec *pattern,
                      const struct http_request *http);
 
-extern jb_err create_url_spec(struct url_spec *url, char *buf);
-extern void free_url_spec(struct url_spec *url);
+extern jb_err create_pattern_spec(struct pattern_spec *url, char *buf);
+extern void free_pattern_spec(struct pattern_spec *url);
 extern int match_portlist(const char *portlist, int port);
 extern jb_err parse_forwarder_address(char *address, char **hostname, int *port);
 
@@ -67,10 +63,6 @@ extern jb_err parse_forwarder_address(char *address, char **hostname, int *port)
 extern const char urlmatch_rcs[];
 extern const char urlmatch_h_rcs[];
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 #endif /* ndef URLMATCH_H_INCLUDED */
 
 /*