Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/urlmatch.h b/urlmatch.h
index e482148248d2dac64656bd9a66af0bd6224ea929..eed5f292354cfef466f15f29ef944450e10d4d1a 100644 (file)
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -33,7 +33,7 @@ struct url_info {
                                 * '?...' and '#...' portion; will always be >= 1 */
 };
 
-extern char *url_normalize(const char *, struct url_info *);
+char *url_normalize(const char *, struct url_info *);
 
 struct urlmatch_item {
        size_t hostmatch_len;
@@ -52,6 +52,6 @@ struct urlmatch_config {
        int (*cascade_fn)(const char *var, const char *value, void *cb);
 };
 
-extern int urlmatch_config_entry(const char *var, const char *value, void *cb);
+int urlmatch_config_entry(const char *var, const char *value, void *cb);
 
 #endif /* URL_MATCH_H */