dovecot-2.2: lib-fts: Include fts-filter.h in fts-filter-private.h

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/51194b531dd7
changeset: 18799:51194b531dd7
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jun 02 21:45:46 2015 +0300
description:
lib-fts: Include fts-filter.h in fts-filter-private.h
This avoids having to always include them both.

diffstat:

 src/lib-fts/fts-filter-lowercase.c        |  1 -
 src/lib-fts/fts-filter-normalizer-icu.c   |  1 -
 src/lib-fts/fts-filter-private.h          |  2 ++
 src/lib-fts/fts-filter-stemmer-snowball.c |  1 -
 src/lib-fts/fts-filter-stopwords.c        |  1 -
 src/lib-fts/fts-filter.c                  |  1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diffs (67 lines):

diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter-lowercase.c
--- a/src/lib-fts/fts-filter-lowercase.c	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter-lowercase.c	Tue Jun 02 21:45:46 2015 +0300
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "str.h"
-#include "fts-filter.h"
 #include "fts-filter-private.h"
 #include "fts-language.h"
 
diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter-normalizer-icu.c
--- a/src/lib-fts/fts-filter-normalizer-icu.c	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter-normalizer-icu.c	Tue Jun 02 21:45:46 2015 +0300
@@ -4,7 +4,6 @@
 #include "buffer.h"
 #include "str.h"
 #include "unichar.h" /* unicode replacement char */
-#include "fts-filter.h"
 #include "fts-filter-private.h"
 #include "fts-language.h"
 
diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter-private.h
--- a/src/lib-fts/fts-filter-private.h	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter-private.h	Tue Jun 02 21:45:46 2015 +0300
@@ -1,6 +1,8 @@
 #ifndef FTS_FILTER_PRIVATE_H
 #define FTS_FILTER_PRIVATE_H
 
+#include "fts-filter.h"
+
 #define FTS_FILTER_CLASSES_NR 3
 
 /*
diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter-stemmer-snowball.c
--- a/src/lib-fts/fts-filter-stemmer-snowball.c	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter-stemmer-snowball.c	Tue Jun 02 21:45:46 2015 +0300
@@ -2,7 +2,6 @@
 
 #include "lib.h"
 #include "fts-language.h"
-#include "fts-filter.h"
 #include "fts-filter-private.h"
 
 #ifdef HAVE_FTS_STEMMER
diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter-stopwords.c
--- a/src/lib-fts/fts-filter-stopwords.c	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter-stopwords.c	Tue Jun 02 21:45:46 2015 +0300
@@ -7,7 +7,6 @@
 #include "hash.h"
 #include "unichar.h"
 #include "fts-language.h"
-#include "fts-filter.h"
 #include "fts-filter-private.h"
 
 #define STOPWORDS_FILE_FORMAT "%s/stopwords_%s.txt"
diff -r b8665bd3574b -r 51194b531dd7 src/lib-fts/fts-filter.c
--- a/src/lib-fts/fts-filter.c	Tue Jun 02 21:43:27 2015 +0300
+++ b/src/lib-fts/fts-filter.c	Tue Jun 02 21:45:46 2015 +0300
@@ -3,7 +3,6 @@
 #include "lib.h"
 #include "array.h"
 #include "fts-language.h"
-#include "fts-filter.h"
 #include "fts-filter-private.h"
 #ifdef HAVE_LIBICU
 #  include <unicode/uclean.h>