renamed matches.h and matches.cpp to

matches2.h and matches2.cpp to avoid potential
confusion with Matches.h and Matches.cpp files.

Linkdb.cpp

@@ -377,7 +377,7 @@ key224_t Linkdb::makeKey_uk ( uint32_t  linkeeSiteHash32       ,
 
 #include "Collectiondb.h"
 #include "CollectionRec.h"
-#include "matches.h"
+#include "matches2.h"
 
 // 1MB read size for now
 #define READSIZE 1000000

Makefile

@@ -48,7 +48,7 @@ OBJS =  Tfndb.o UdpSlot.o \
 	PageLogView.o Msg1f.o Blaster.o MsgC.o \
 	PageSpam.o Proxy.o PageThreads.o Linkdb.o \
 	PageNetTest.o \
-	matches.o LanguageIdentifier.o \
+	matches2.o LanguageIdentifier.o \
 	Language.o Repair.o Process.o Msg3e.o \
 	Abbreviations.o \
 	RequestTable.o TuringTest.o Msg51.o geo_ip_table.o \
@@ -255,7 +255,7 @@ Matches.o:
 Highlight.o:
 	$(CC) $(DEFS) $(CPPFLAGS) -O2 -c $*.cpp 
 
-matches.o:
+matches2.o:
 	$(CC) $(DEFS) $(CPPFLAGS) -O2 -c $*.cpp 
 
 linkspam.o:

Msg40.cpp

@@ -9,7 +9,7 @@
 //#include "TitleRec.h"      // containsAdultWords ()
 #include "LanguageIdentifier.h"
 #include "sort.h"
-#include "matches.h"
+#include "matches2.h"
 #include "XmlDoc.h" // computeSimilarity()
 //#include "Facebook.h" // msgfb
 #include "Speller.h"

Summary.h

@@ -22,7 +22,7 @@
 
 #include "gb-include.h"
 #include "Unicode.h"
-#include "matches.h"
+#include "matches2.h"
 #include "Query.h"
 #include "Xml.h"
 #include "Mem.h"

XmlDoc.cpp

@@ -3015,7 +3015,7 @@ char **XmlDoc::getTitleRec ( ) {
 // . an "id" of 2 means very indicative of a dirty doc
 // . an "id" of 1 means it must be joined with another dirty word to indicate
 // . taken mostly from Url.cpp
-// . see matches.h for Needle class definition
+// . see matches2.h for Needle class definition
 static Needle s_dirtyWords []  = {
 	{"upskirt"    ,0,2,0,0,NULL,0,NULL},
 	{"downblouse" ,0,2,0,0,NULL,0,NULL},

linkspam.cpp

@@ -8,7 +8,7 @@
 #include "Linkdb.h"
 //#include "TitleRec.h"
 #include "Unicode.h"
-#include "matches.h"
+#include "matches2.h"
 #include "Categories.h"
 
 bool isLinkChain ( Xml *xml , Url *linker , Url *linkee , long linkNode ,

matches2.cpp

@@ -1,6 +1,6 @@
 #include "gb-include.h"
 
-#include "matches.h"
+#include "matches2.h"
 #include "Unicode.h"
 #include "Titledb.h"
 #include "HashTableT.h"