You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2010/11/03 05:37:03 UTC

[lucy-commits] svn commit: r1030328 [1/2] - in /incubator/lucy/trunk: clownfish/lib/Clownfish/Binding/Core/ core/KinoSearch/ core/KinoSearch/Analysis/ core/KinoSearch/Document/ core/KinoSearch/Highlight/ core/KinoSearch/Index/ core/KinoSearch/Index/Posting/ core/Kino...

Author: marvin
Date: Wed Nov  3 04:36:57 2010
New Revision: 1030328

URL: http://svn.apache.org/viewvc?rev=1030328&view=rev
Log:
Change over all C_KINO_FOO symbols (which indicate that Foo's struct
definition should be available) over to C_LUCY_FOO.  To do this in isolation
requires a couple temporary hacks to Clownfish.

Modified:
    incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm
    incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/File.pm
    incubator/lucy/trunk/core/KinoSearch/Analysis/Analyzer.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/CaseFolder.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/Inversion.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/PolyAnalyzer.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/Stopalizer.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/Token.c
    incubator/lucy/trunk/core/KinoSearch/Analysis/Tokenizer.c
    incubator/lucy/trunk/core/KinoSearch/Document/Doc.c
    incubator/lucy/trunk/core/KinoSearch/Document/HitDoc.c
    incubator/lucy/trunk/core/KinoSearch/Highlight/HeatMap.c
    incubator/lucy/trunk/core/KinoSearch/Highlight/Highlighter.c
    incubator/lucy/trunk/core/KinoSearch/Index/BackgroundMerger.c
    incubator/lucy/trunk/core/KinoSearch/Index/BitVecDelDocs.c
    incubator/lucy/trunk/core/KinoSearch/Index/DataReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/DataWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/DeletionsReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/DeletionsWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/DocReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/DocVector.c
    incubator/lucy/trunk/core/KinoSearch/Index/DocWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/FilePurger.c
    incubator/lucy/trunk/core/KinoSearch/Index/HighlightReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/HighlightWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/IndexManager.c
    incubator/lucy/trunk/core/KinoSearch/Index/IndexReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/Indexer.c
    incubator/lucy/trunk/core/KinoSearch/Index/Inverter.c
    incubator/lucy/trunk/core/KinoSearch/Index/LexIndex.c
    incubator/lucy/trunk/core/KinoSearch/Index/Lexicon.c
    incubator/lucy/trunk/core/KinoSearch/Index/LexiconReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/LexiconWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/PolyLexicon.c
    incubator/lucy/trunk/core/KinoSearch/Index/PolyReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/Posting.c
    incubator/lucy/trunk/core/KinoSearch/Index/Posting/MatchPosting.c
    incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.c
    incubator/lucy/trunk/core/KinoSearch/Index/Posting/RichPosting.c
    incubator/lucy/trunk/core/KinoSearch/Index/Posting/ScorePosting.c
    incubator/lucy/trunk/core/KinoSearch/Index/PostingList.c
    incubator/lucy/trunk/core/KinoSearch/Index/PostingListReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/PostingListWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/PostingPool.c
    incubator/lucy/trunk/core/KinoSearch/Index/RawLexicon.c
    incubator/lucy/trunk/core/KinoSearch/Index/RawPostingList.c
    incubator/lucy/trunk/core/KinoSearch/Index/SegLexicon.c
    incubator/lucy/trunk/core/KinoSearch/Index/SegPostingList.c
    incubator/lucy/trunk/core/KinoSearch/Index/SegReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/SegWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/Segment.c
    incubator/lucy/trunk/core/KinoSearch/Index/Similarity.c
    incubator/lucy/trunk/core/KinoSearch/Index/SkipStepper.c
    incubator/lucy/trunk/core/KinoSearch/Index/Snapshot.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortCache.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortCache/NumericSortCache.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortCache/TextSortCache.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortFieldWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortReader.c
    incubator/lucy/trunk/core/KinoSearch/Index/SortWriter.c
    incubator/lucy/trunk/core/KinoSearch/Index/TermInfo.c
    incubator/lucy/trunk/core/KinoSearch/Index/TermStepper.c
    incubator/lucy/trunk/core/KinoSearch/Index/TermVector.c
    incubator/lucy/trunk/core/KinoSearch/Index/ZombieKeyedHash.c
    incubator/lucy/trunk/core/KinoSearch/Object/BitVector.c
    incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c
    incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c
    incubator/lucy/trunk/core/KinoSearch/Object/Err.c
    incubator/lucy/trunk/core/KinoSearch/Object/Hash.c
    incubator/lucy/trunk/core/KinoSearch/Object/I32Array.c
    incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c
    incubator/lucy/trunk/core/KinoSearch/Object/Num.c
    incubator/lucy/trunk/core/KinoSearch/Object/Obj.c
    incubator/lucy/trunk/core/KinoSearch/Object/VArray.c
    incubator/lucy/trunk/core/KinoSearch/Object/VTable.c
    incubator/lucy/trunk/core/KinoSearch/Plan/Architecture.c
    incubator/lucy/trunk/core/KinoSearch/Plan/BlobType.c
    incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.c
    incubator/lucy/trunk/core/KinoSearch/Plan/FullTextType.c
    incubator/lucy/trunk/core/KinoSearch/Plan/NumericType.c
    incubator/lucy/trunk/core/KinoSearch/Plan/Schema.c
    incubator/lucy/trunk/core/KinoSearch/Plan/StringType.c
    incubator/lucy/trunk/core/KinoSearch/Plan/TextType.c
    incubator/lucy/trunk/core/KinoSearch/Search/ANDQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/ANDScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/BitVecMatcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/Collector.c
    incubator/lucy/trunk/core/KinoSearch/Search/Collector/SortCollector.c
    incubator/lucy/trunk/core/KinoSearch/Search/Compiler.c
    incubator/lucy/trunk/core/KinoSearch/Search/HitQueue.c
    incubator/lucy/trunk/core/KinoSearch/Search/Hits.c
    incubator/lucy/trunk/core/KinoSearch/Search/IndexSearcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/LeafQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/MatchAllQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/MatchAllScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/MatchDoc.c
    incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/NOTQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/NOTScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/NoMatchQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/NoMatchScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/ORQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/PhraseQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/PhraseScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/PolyMatcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/PolyQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/Query.c
    incubator/lucy/trunk/core/KinoSearch/Search/QueryParser.c
    incubator/lucy/trunk/core/KinoSearch/Search/RangeQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/RangeScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/RequiredOptionalQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/RequiredOptionalScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/Searcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/SeriesMatcher.c
    incubator/lucy/trunk/core/KinoSearch/Search/SortRule.c
    incubator/lucy/trunk/core/KinoSearch/Search/SortSpec.c
    incubator/lucy/trunk/core/KinoSearch/Search/Span.c
    incubator/lucy/trunk/core/KinoSearch/Search/TermQuery.c
    incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.c
    incubator/lucy/trunk/core/KinoSearch/Search/TopDocs.c
    incubator/lucy/trunk/core/KinoSearch/Store/CompoundFileReader.c
    incubator/lucy/trunk/core/KinoSearch/Store/CompoundFileWriter.c
    incubator/lucy/trunk/core/KinoSearch/Store/DirHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/FSDirHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/FSFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/FSFolder.c
    incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/FileWindow.c
    incubator/lucy/trunk/core/KinoSearch/Store/Folder.c
    incubator/lucy/trunk/core/KinoSearch/Store/InStream.c
    incubator/lucy/trunk/core/KinoSearch/Store/Lock.c
    incubator/lucy/trunk/core/KinoSearch/Store/LockFactory.c
    incubator/lucy/trunk/core/KinoSearch/Store/OutStream.c
    incubator/lucy/trunk/core/KinoSearch/Store/RAMDirHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/RAMFile.c
    incubator/lucy/trunk/core/KinoSearch/Store/RAMFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Store/RAMFolder.c
    incubator/lucy/trunk/core/KinoSearch/Store/SharedLock.c
    incubator/lucy/trunk/core/KinoSearch/Test.c
    incubator/lucy/trunk/core/KinoSearch/Test/Analysis/TestCaseFolder.c
    incubator/lucy/trunk/core/KinoSearch/Test/Analysis/TestPolyAnalyzer.c
    incubator/lucy/trunk/core/KinoSearch/Test/Analysis/TestStemmer.c
    incubator/lucy/trunk/core/KinoSearch/Test/Analysis/TestStopalizer.c
    incubator/lucy/trunk/core/KinoSearch/Test/Analysis/TestTokenizer.c
    incubator/lucy/trunk/core/KinoSearch/Test/Index/TestDocWriter.c
    incubator/lucy/trunk/core/KinoSearch/Test/Index/TestHighlightWriter.c
    incubator/lucy/trunk/core/KinoSearch/Test/Index/TestPostingListWriter.c
    incubator/lucy/trunk/core/KinoSearch/Test/Index/TestSegWriter.c
    incubator/lucy/trunk/core/KinoSearch/Test/Index/TestSegment.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestBitVector.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestByteBuf.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestCharBuf.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestI32Array.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestNum.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestObj.c
    incubator/lucy/trunk/core/KinoSearch/Test/Object/TestVArray.c
    incubator/lucy/trunk/core/KinoSearch/Test/Plan/TestArchitecture.c
    incubator/lucy/trunk/core/KinoSearch/Test/Plan/TestBlobType.c
    incubator/lucy/trunk/core/KinoSearch/Test/Plan/TestFullTextType.c
    incubator/lucy/trunk/core/KinoSearch/Test/Plan/TestNumericType.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestLeafQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestMatchAllQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestNOTQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestNoMatchQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestPhraseQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestPolyQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestRangeQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestReqOptQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestSeriesMatcher.c
    incubator/lucy/trunk/core/KinoSearch/Test/Search/TestTermQuery.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/MockFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestCompoundFileReader.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestCompoundFileWriter.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFSFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolder.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestIOChunks.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestIOPrimitives.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestInStream.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestRAMDirHandle.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestRAMFileHandle.c
    incubator/lucy/trunk/core/KinoSearch/Test/Store/TestRAMFolder.c
    incubator/lucy/trunk/core/KinoSearch/Test/TestQueryParser.c
    incubator/lucy/trunk/core/KinoSearch/Test/TestQueryParserLogic.c
    incubator/lucy/trunk/core/KinoSearch/Test/TestQueryParserSyntax.c
    incubator/lucy/trunk/core/KinoSearch/Test/TestSchema.c
    incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.c
    incubator/lucy/trunk/core/KinoSearch/Test/Util/BBSortEx.c
    incubator/lucy/trunk/core/KinoSearch/Test/Util/TestMemory.c
    incubator/lucy/trunk/core/KinoSearch/Test/Util/TestMemoryPool.c
    incubator/lucy/trunk/core/KinoSearch/Test/Util/TestNumberUtils.c
    incubator/lucy/trunk/core/KinoSearch/Test/Util/TestPriorityQueue.c
    incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c
    incubator/lucy/trunk/core/KinoSearch/Util/Debug.c
    incubator/lucy/trunk/core/KinoSearch/Util/Freezer.c
    incubator/lucy/trunk/core/KinoSearch/Util/IndexFileNames.c
    incubator/lucy/trunk/core/KinoSearch/Util/Memory.c
    incubator/lucy/trunk/core/KinoSearch/Util/MemoryPool.c
    incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c
    incubator/lucy/trunk/core/KinoSearch/Util/PriorityQueue.c
    incubator/lucy/trunk/core/KinoSearch/Util/Sleep.c
    incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.c
    incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c
    incubator/lucy/trunk/core/KinoSearch/Util/Stepper.c
    incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c
    incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c
    incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c
    incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c
    incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Analysis/CaseFolder.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Analysis/Tokenizer.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Document/Doc.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Object/LockFreeRegistry.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Object/Obj.c
    incubator/lucy/trunk/perl/xs/KinoSearch/Object/VTable.c
    incubator/lucy/trunk/perl/xs/XSBind.c

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm Wed Nov  3 04:36:57 2010
@@ -134,6 +134,9 @@ sub to_c_header {
     my $full_struct   = $client->full_struct_sym;
     my $c_file_sym    = "C_" . uc($full_struct);
     my $struct_def    = _struct_definition($self);
+    
+    # Temporary hack.
+    $c_file_sym =~ s/KINO_/LUCY_/g;
 
     # If class inherits from something, include the parent class's header.
     my $parent_include = "";

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/File.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/File.pm?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/File.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/File.pm Wed Nov  3 04:36:57 2010
@@ -125,6 +125,10 @@ sub write_c {
                     );
                 $content .= $bound->to_c . "\n";
                 my $c_file_sym = "C_" . uc( $block->full_struct_sym );
+
+                # Temporary hack.
+                $c_file_sym =~ s/KINO/LUCY/;
+
                 $c_file_syms .= "#define $c_file_sym\n";
             }
         }
@@ -134,8 +138,8 @@ sub write_c {
 $args{header}
 
 $c_file_syms
-#define C_KINO_VTABLE
-#define C_KINO_ZOMBIECHARBUF
+#define C_LUCY_VTABLE
+#define C_LUCY_ZOMBIECHARBUF
 #include "boil.h"
 #include "KinoSearch/Object/VTable.h"
 #include "KinoSearch/Object/CharBuf.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Analyzer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Analyzer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Analyzer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Analyzer.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_ANALYZER
-#define C_KINO_TOKEN
+#define C_LUCY_ANALYZER
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/Analyzer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/CaseFolder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/CaseFolder.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/CaseFolder.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/CaseFolder.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_CASEFOLDER
+#define C_LUCY_CASEFOLDER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/CaseFolder.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Inversion.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Inversion.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Inversion.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Inversion.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_INVERSION
-#define C_KINO_TOKEN
+#define C_LUCY_INVERSION
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/Inversion.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/PolyAnalyzer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/PolyAnalyzer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/PolyAnalyzer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/PolyAnalyzer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYANALYZER
+#define C_LUCY_POLYANALYZER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/PolyAnalyzer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_STEMMER
-#define C_KINO_TOKEN
+#define C_LUCY_STEMMER
+#define C_LUCY_TOKEN
 #include <ctype.h>
 #include "KinoSearch/Util/ToolSet.h"
 

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Stopalizer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Stopalizer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Stopalizer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Stopalizer.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_STOPALIZER
-#define C_KINO_TOKEN
+#define C_LUCY_STOPALIZER
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/Stopalizer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Token.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Token.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Token.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Token.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_TOKEN
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/Token.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Tokenizer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Tokenizer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Tokenizer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Tokenizer.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_TOKENIZER
-#define C_KINO_TOKEN
+#define C_LUCY_TOKENIZER
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Analysis/Tokenizer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Document/Doc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Document/Doc.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Document/Doc.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Document/Doc.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_DOC
+#define C_LUCY_DOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Document/Doc.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Document/HitDoc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Document/HitDoc.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Document/HitDoc.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Document/HitDoc.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_HITDOC
+#define C_LUCY_HITDOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Document/HitDoc.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Highlight/HeatMap.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Highlight/HeatMap.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Highlight/HeatMap.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Highlight/HeatMap.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_HEATMAP
-#define C_KINO_SPAN
+#define C_LUCY_HEATMAP
+#define C_LUCY_SPAN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Highlight/HeatMap.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Highlight/Highlighter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Highlight/Highlighter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Highlight/Highlighter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Highlight/Highlighter.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_HIGHLIGHTER
-#define C_KINO_SPAN
+#define C_LUCY_HIGHLIGHTER
+#define C_LUCY_SPAN
 #include <ctype.h>
 #include "KinoSearch/Util/ToolSet.h"
 

Modified: incubator/lucy/trunk/core/KinoSearch/Index/BackgroundMerger.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/BackgroundMerger.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/BackgroundMerger.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/BackgroundMerger.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_BACKGROUNDMERGER
+#define C_LUCY_BACKGROUNDMERGER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/BackgroundMerger.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/BitVecDelDocs.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/BitVecDelDocs.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/BitVecDelDocs.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/BitVecDelDocs.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_BITVECDELDOCS
+#define C_LUCY_BITVECDELDOCS
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/BitVecDelDocs.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DataReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DataReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DataReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DataReader.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_DATAREADER
+#define C_LUCY_DATAREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DataReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DataWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DataWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DataWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DataWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_DATAWRITER
+#define C_LUCY_DATAWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DataWriter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DeletionsReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DeletionsReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DeletionsReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DeletionsReader.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_DELETIONSREADER
-#define C_KINO_POLYDELETIONSREADER
-#define C_KINO_DEFAULTDELETIONSREADER
+#define C_LUCY_DELETIONSREADER
+#define C_LUCY_POLYDELETIONSREADER
+#define C_LUCY_DEFAULTDELETIONSREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DeletionsReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DeletionsWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DeletionsWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DeletionsWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DeletionsWriter.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_DELETIONSWRITER
-#define C_KINO_DEFAULTDELETIONSWRITER
+#define C_LUCY_DELETIONSWRITER
+#define C_LUCY_DEFAULTDELETIONSWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include <math.h>

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DocReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DocReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DocReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DocReader.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_DOCREADER
-#define C_KINO_POLYDOCREADER
-#define C_KINO_DEFAULTDOCREADER
+#define C_LUCY_DOCREADER
+#define C_LUCY_POLYDOCREADER
+#define C_LUCY_DEFAULTDOCREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DocReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DocVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DocVector.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DocVector.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DocVector.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_DOCVECTOR
+#define C_LUCY_DOCVECTOR
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DocVector.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/DocWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/DocWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/DocWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/DocWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_DOCWRITER
+#define C_LUCY_DOCWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/DocWriter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/FilePurger.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/FilePurger.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/FilePurger.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/FilePurger.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_FILEPURGER
+#define C_LUCY_FILEPURGER
 #include <ctype.h>
 #include "KinoSearch/Util/ToolSet.h"
 

Modified: incubator/lucy/trunk/core/KinoSearch/Index/HighlightReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/HighlightReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/HighlightReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/HighlightReader.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_HIGHLIGHTREADER
-#define C_KINO_POLYHIGHLIGHTREADER
-#define C_KINO_DEFAULTHIGHLIGHTREADER
+#define C_LUCY_HIGHLIGHTREADER
+#define C_LUCY_POLYHIGHLIGHTREADER
+#define C_LUCY_DEFAULTHIGHLIGHTREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/HighlightReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/HighlightWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/HighlightWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/HighlightWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/HighlightWriter.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_HIGHLIGHTWRITER
-#define C_KINO_DEFAULTHIGHLIGHTWRITER
-#define C_KINO_TOKEN
+#define C_LUCY_HIGHLIGHTWRITER
+#define C_LUCY_DEFAULTHIGHLIGHTWRITER
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include <stdio.h>

Modified: incubator/lucy/trunk/core/KinoSearch/Index/IndexManager.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/IndexManager.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/IndexManager.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/IndexManager.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_INDEXMANAGER
+#define C_LUCY_INDEXMANAGER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/IndexManager.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/IndexReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/IndexReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/IndexReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/IndexReader.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_INDEXREADER
+#define C_LUCY_INDEXREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/IndexReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Indexer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Indexer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Indexer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Indexer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_INDEXER
+#define C_LUCY_INDEXER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Indexer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Inverter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Inverter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Inverter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Inverter.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_INVERTER
-#define C_KINO_INVERTERENTRY
+#define C_LUCY_INVERTER
+#define C_LUCY_INVERTERENTRY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Inverter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/LexIndex.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/LexIndex.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/LexIndex.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/LexIndex.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_LEXINDEX
-#define C_KINO_TERMINFO
+#define C_LUCY_LEXINDEX
+#define C_LUCY_TERMINFO
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/LexIndex.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Lexicon.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Lexicon.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Lexicon.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Lexicon.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_LEXICON
+#define C_LUCY_LEXICON
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Lexicon.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/LexiconReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/LexiconReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/LexiconReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/LexiconReader.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_LEXICONREADER
-#define C_KINO_POLYLEXICONREADER
-#define C_KINO_DEFAULTLEXICONREADER
+#define C_LUCY_LEXICONREADER
+#define C_LUCY_POLYLEXICONREADER
+#define C_LUCY_DEFAULTLEXICONREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/LexiconReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/LexiconWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/LexiconWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/LexiconWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/LexiconWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_LEXICONWRITER
+#define C_LUCY_LEXICONWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/LexiconWriter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PolyLexicon.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PolyLexicon.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PolyLexicon.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PolyLexicon.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYLEXICON
+#define C_LUCY_POLYLEXICON
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/PolyLexicon.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PolyReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PolyReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PolyReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PolyReader.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYREADER
+#define C_LUCY_POLYREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/PolyReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_POSTING
-#define C_KINO_POSTINGWRITER
+#define C_LUCY_POSTING
+#define C_LUCY_POSTINGWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Posting.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting/MatchPosting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting/MatchPosting.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting/MatchPosting.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting/MatchPosting.c Wed Nov  3 04:36:57 2010
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#define C_KINO_MATCHPOSTING
-#define C_KINO_MATCHPOSTINGSCORER
-#define C_KINO_MATCHPOSTINGWRITER
-#define C_KINO_MATCHTERMINFOSTEPPER
-#define C_KINO_RAWPOSTING
-#define C_KINO_TERMINFO
-#define C_KINO_TOKEN
+#define C_LUCY_MATCHPOSTING
+#define C_LUCY_MATCHPOSTINGSCORER
+#define C_LUCY_MATCHPOSTINGWRITER
+#define C_LUCY_MATCHTERMINFOSTEPPER
+#define C_LUCY_RAWPOSTING
+#define C_LUCY_TERMINFO
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Posting/MatchPosting.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_RAWPOSTING
-#define C_KINO_RAWPOSTINGWRITER
-#define C_KINO_TERMINFO
+#define C_LUCY_RAWPOSTING
+#define C_LUCY_RAWPOSTINGWRITER
+#define C_LUCY_TERMINFO
 #include "KinoSearch/Util/ToolSet.h"
 
 #include <string.h>

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting/RichPosting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting/RichPosting.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting/RichPosting.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting/RichPosting.c Wed Nov  3 04:36:57 2010
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define C_KINO_RICHPOSTING
-#define C_KINO_RICHPOSTINGSCORER
-#define C_KINO_RAWPOSTING
-#define C_KINO_TOKEN
+#define C_LUCY_RICHPOSTING
+#define C_LUCY_RICHPOSTINGSCORER
+#define C_LUCY_RAWPOSTING
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Posting/RichPosting.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting/ScorePosting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting/ScorePosting.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting/ScorePosting.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting/ScorePosting.c Wed Nov  3 04:36:57 2010
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define C_KINO_SCOREPOSTING
-#define C_KINO_SCOREPOSTINGSCORER
-#define C_KINO_RAWPOSTING
-#define C_KINO_TOKEN
+#define C_LUCY_SCOREPOSTING
+#define C_LUCY_SCOREPOSTINGSCORER
+#define C_LUCY_RAWPOSTING
+#define C_LUCY_TOKEN
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Posting/ScorePosting.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PostingList.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PostingList.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PostingList.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PostingList.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POSTINGLIST
+#define C_LUCY_POSTINGLIST
 #include <string.h>
 
 #include "KinoSearch/Util/ToolSet.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PostingListReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PostingListReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PostingListReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PostingListReader.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_POSTINGLISTREADER
-#define C_KINO_POLYPOSTINGLISTREADER
-#define C_KINO_DEFAULTPOSTINGLISTREADER
+#define C_LUCY_POSTINGLISTREADER
+#define C_LUCY_POLYPOSTINGLISTREADER
+#define C_LUCY_DEFAULTPOSTINGLISTREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/PostingListReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PostingListWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PostingListWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PostingListWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PostingListWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POSTINGLISTWRITER
+#define C_LUCY_POSTINGLISTWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/PostingListWriter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/PostingPool.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/PostingPool.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/PostingPool.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/PostingPool.c Wed Nov  3 04:36:57 2010
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#define C_KINO_POSTINGPOOL
-#define C_KINO_RAWPOSTING
-#define C_KINO_MEMORYPOOL
-#define C_KINO_TERMINFO
-#define C_KINO_SKIPSTEPPER
+#define C_LUCY_POSTINGPOOL
+#define C_LUCY_RAWPOSTING
+#define C_LUCY_MEMORYPOOL
+#define C_LUCY_TERMINFO
+#define C_LUCY_SKIPSTEPPER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/PostingPool.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/RawLexicon.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/RawLexicon.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/RawLexicon.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/RawLexicon.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_RAWLEXICON
+#define C_LUCY_RAWLEXICON
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/RawLexicon.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/RawPostingList.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/RawPostingList.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/RawPostingList.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/RawPostingList.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_RAWPOSTINGLIST
+#define C_LUCY_RAWPOSTINGLIST
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/RawPostingList.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SegLexicon.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SegLexicon.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SegLexicon.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SegLexicon.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SEGLEXICON
+#define C_LUCY_SEGLEXICON
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SegLexicon.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SegPostingList.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SegPostingList.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SegPostingList.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SegPostingList.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_SEGPOSTINGLIST
-#define C_KINO_POSTING
-#define C_KINO_SKIPSTEPPER
+#define C_LUCY_SEGPOSTINGLIST
+#define C_LUCY_POSTING
+#define C_LUCY_SKIPSTEPPER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SegPostingList.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SegReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SegReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SegReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SegReader.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SEGREADER
+#define C_LUCY_SEGREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SegReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SegWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SegWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SegWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SegWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SEGWRITER
+#define C_LUCY_SEGWRITER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SegWriter.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Segment.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Segment.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Segment.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Segment.c Wed Nov  3 04:36:57 2010
@@ -16,7 +16,7 @@
 
 #include <ctype.h>
 
-#define C_KINO_SEGMENT
+#define C_LUCY_SEGMENT
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Segment.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Similarity.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Similarity.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Similarity.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Similarity.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SIMILARITY
+#define C_LUCY_SIMILARITY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "math.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SkipStepper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SkipStepper.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SkipStepper.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SkipStepper.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SKIPSTEPPER
+#define C_LUCY_SKIPSTEPPER
 #include <stdio.h>
 
 #include "KinoSearch/Util/ToolSet.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/Snapshot.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Snapshot.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Snapshot.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Snapshot.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SNAPSHOT
+#define C_LUCY_SNAPSHOT
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/Snapshot.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortCache.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortCache.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortCache.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SORTCACHE
+#define C_LUCY_SORTCACHE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SortCache.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortCache/NumericSortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortCache/NumericSortCache.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortCache/NumericSortCache.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortCache/NumericSortCache.c Wed Nov  3 04:36:57 2010
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#define C_KINO_NUMERICSORTCACHE
-#define C_KINO_INT32SORTCACHE
-#define C_KINO_INT64SORTCACHE
-#define C_KINO_FLOAT32SORTCACHE
-#define C_KINO_FLOAT64SORTCACHE
+#define C_LUCY_NUMERICSORTCACHE
+#define C_LUCY_INT32SORTCACHE
+#define C_LUCY_INT64SORTCACHE
+#define C_LUCY_FLOAT32SORTCACHE
+#define C_LUCY_FLOAT64SORTCACHE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SortCache/NumericSortCache.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortCache/TextSortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortCache/TextSortCache.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortCache/TextSortCache.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortCache/TextSortCache.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_TEXTSORTCACHE
+#define C_LUCY_TEXTSORTCACHE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SortCache/TextSortCache.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortFieldWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortFieldWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortFieldWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortFieldWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SORTFIELDWRITER
+#define C_LUCY_SORTFIELDWRITER
 #include "KinoSearch/Util/ToolSet.h"
 #include <math.h>
 

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortReader.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortReader.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortReader.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_SORTREADER
-#define C_KINO_DEFAULTSORTREADER
+#define C_LUCY_SORTREADER
+#define C_LUCY_DEFAULTSORTREADER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/SortReader.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/SortWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/SortWriter.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/SortWriter.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/SortWriter.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SORTWRITER
+#define C_LUCY_SORTWRITER
 #include "KinoSearch/Util/ToolSet.h"
 #include <math.h>
 

Modified: incubator/lucy/trunk/core/KinoSearch/Index/TermInfo.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/TermInfo.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/TermInfo.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/TermInfo.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_TERMINFO
+#define C_LUCY_TERMINFO
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/TermInfo.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/TermStepper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/TermStepper.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/TermStepper.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/TermStepper.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_TERMSTEPPER
+#define C_LUCY_TERMSTEPPER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/TermStepper.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/TermVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/TermVector.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/TermVector.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/TermVector.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_TERMVECTOR
-#define C_KINO_I32ARRAY
+#define C_LUCY_TERMVECTOR
+#define C_LUCY_I32ARRAY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/TermVector.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Index/ZombieKeyedHash.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/ZombieKeyedHash.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/ZombieKeyedHash.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/ZombieKeyedHash.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_ZOMBIEKEYEDHASH
+#define C_LUCY_ZOMBIEKEYEDHASH
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Index/ZombieKeyedHash.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Object/BitVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/BitVector.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/BitVector.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/BitVector.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_BITVECTOR
+#define C_LUCY_BITVECTOR
 #include "KinoSearch/Util/ToolSet.h"
 
 #include <math.h>

Modified: incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_BYTEBUF
-#define C_KINO_VIEWBYTEBUF
+#define C_LUCY_BYTEBUF
+#define C_LUCY_VIEWBYTEBUF
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_CHARBUF
-#define C_KINO_VIEWCHARBUF
-#define C_KINO_ZOMBIECHARBUF
+#define C_LUCY_CHARBUF
+#define C_LUCY_VIEWCHARBUF
+#define C_LUCY_ZOMBIECHARBUF
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Err.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Err.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Err.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_ERR
-#define C_KINO_OBJ
-#define C_KINO_VTABLE
+#define C_LUCY_ERR
+#define C_LUCY_OBJ
+#define C_LUCY_VTABLE
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/Hash.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Hash.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Hash.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Hash.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_HASH
-#define C_KINO_HASHTOMBSTONE
+#define C_LUCY_HASH
+#define C_LUCY_HASHTOMBSTONE
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/I32Array.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/I32Array.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/I32Array.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/I32Array.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_I32ARRAY
+#define C_LUCY_I32ARRAY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Object/I32Array.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_LOCKFREEREGISTRY
+#define C_LUCY_LOCKFREEREGISTRY
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/Num.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Num.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Num.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Num.c Wed Nov  3 04:36:57 2010
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#define C_KINO_NUM
-#define C_KINO_INTNUM
-#define C_KINO_FLOATNUM
-#define C_KINO_INTEGER32
-#define C_KINO_INTEGER64
-#define C_KINO_FLOAT32
-#define C_KINO_FLOAT64
+#define C_LUCY_NUM
+#define C_LUCY_INTNUM
+#define C_LUCY_FLOATNUM
+#define C_LUCY_INTEGER32
+#define C_LUCY_INTEGER64
+#define C_LUCY_FLOAT32
+#define C_LUCY_FLOAT64
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/Obj.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Obj.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Obj.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Obj.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_OBJ
-#define C_KINO_VTABLE
+#define C_LUCY_OBJ
+#define C_LUCY_VTABLE
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/VArray.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/VArray.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/VArray.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/VArray.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_VARRAY
+#define C_LUCY_VARRAY
 #include <string.h>
 #include <stdlib.h>
 

Modified: incubator/lucy/trunk/core/KinoSearch/Object/VTable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/VTable.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/VTable.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/VTable.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_VTABLE
-#define C_KINO_OBJ
+#define C_LUCY_VTABLE
+#define C_LUCY_OBJ
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/Architecture.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/Architecture.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/Architecture.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/Architecture.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_ARCHITECTURE
+#define C_LUCY_ARCHITECTURE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/Architecture.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/BlobType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/BlobType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/BlobType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/BlobType.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_BLOBTYPE
+#define C_LUCY_BLOBTYPE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/BlobType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_FIELDTYPE
+#define C_LUCY_FIELDTYPE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/FieldType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/FullTextType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/FullTextType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/FullTextType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/FullTextType.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_FULLTEXTTYPE
+#define C_LUCY_FULLTEXTTYPE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/FullTextType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/NumericType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/NumericType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/NumericType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/NumericType.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_NUMERICTYPE
+#define C_LUCY_NUMERICTYPE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/NumericType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/Schema.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/Schema.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/Schema.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/Schema.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_SCHEMA
+#define C_LUCY_SCHEMA
 #include <string.h>
 #include <ctype.h>
 #include "KinoSearch/Util/ToolSet.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/StringType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/StringType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/StringType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/StringType.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_STRINGTYPE
+#define C_LUCY_STRINGTYPE
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/StringType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Plan/TextType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/TextType.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/TextType.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/TextType.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_TEXTTYPE
-#define C_KINO_TEXTTERMSTEPPER
+#define C_LUCY_TEXTTYPE
+#define C_LUCY_TEXTTERMSTEPPER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Plan/TextType.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/ANDQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/ANDQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/ANDQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/ANDQuery.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_ANDQUERY
-#define C_KINO_ANDCOMPILER
+#define C_LUCY_ANDQUERY
+#define C_LUCY_ANDCOMPILER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/ANDQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/ANDScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/ANDScorer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/ANDScorer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/ANDScorer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_ANDSCORER
+#define C_LUCY_ANDSCORER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/ANDScorer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/BitVecMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/BitVecMatcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/BitVecMatcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/BitVecMatcher.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_BITVECMATCHER
+#define C_LUCY_BITVECMATCHER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/BitVecMatcher.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Collector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Collector.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Collector.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Collector.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_COLLECTOR
-#define C_KINO_BITCOLLECTOR
-#define C_KINO_OFFSETCOLLECTOR
+#define C_LUCY_COLLECTOR
+#define C_LUCY_BITCOLLECTOR
+#define C_LUCY_OFFSETCOLLECTOR
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/Collector.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Collector/SortCollector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Collector/SortCollector.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Collector/SortCollector.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Collector/SortCollector.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_SORTCOLLECTOR
-#define C_KINO_MATCHDOC
+#define C_LUCY_SORTCOLLECTOR
+#define C_LUCY_MATCHDOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/Collector/SortCollector.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Compiler.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Compiler.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Compiler.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Compiler.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_COMPILER
+#define C_LUCY_COMPILER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/Compiler.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/HitQueue.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/HitQueue.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/HitQueue.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/HitQueue.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_HITQUEUE
-#define C_KINO_MATCHDOC
+#define C_LUCY_HITQUEUE
+#define C_LUCY_MATCHDOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/HitQueue.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Hits.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Hits.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Hits.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Hits.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_HITS
-#define C_KINO_MATCHDOC
+#define C_LUCY_HITS
+#define C_LUCY_MATCHDOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/Hits.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/IndexSearcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/IndexSearcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/IndexSearcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/IndexSearcher.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_INDEXSEARCHER
+#define C_LUCY_INDEXSEARCHER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/IndexSearcher.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/LeafQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/LeafQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/LeafQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/LeafQuery.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_LEAFQUERY
+#define C_LUCY_LEAFQUERY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/LeafQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/MatchAllQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/MatchAllQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/MatchAllQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/MatchAllQuery.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_MATCHALLQUERY
+#define C_LUCY_MATCHALLQUERY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/MatchAllQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/MatchAllScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/MatchAllScorer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/MatchAllScorer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/MatchAllScorer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_MATCHALLSCORER
+#define C_LUCY_MATCHALLSCORER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/MatchAllScorer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/MatchDoc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/MatchDoc.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/MatchDoc.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/MatchDoc.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_MATCHDOC
+#define C_LUCY_MATCHDOC
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/MatchDoc.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_MATCHER
+#define C_LUCY_MATCHER
 #define KINO_USE_SHORT_NAMES
 #define CHY_USE_SHORT_NAMES
 

Modified: incubator/lucy/trunk/core/KinoSearch/Search/NOTQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/NOTQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/NOTQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/NOTQuery.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_NOTQUERY
-#define C_KINO_NOTCOMPILER
+#define C_LUCY_NOTQUERY
+#define C_LUCY_NOTCOMPILER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/NOTQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/NOTScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/NOTScorer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/NOTScorer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/NOTScorer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_NOTSCORER
+#define C_LUCY_NOTSCORER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/NOTScorer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/NoMatchQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/NoMatchQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/NoMatchQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/NoMatchQuery.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_NOMATCHQUERY
+#define C_LUCY_NOMATCHQUERY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/NoMatchQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/NoMatchScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/NoMatchScorer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/NoMatchScorer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/NoMatchScorer.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_NOMATCHSCORER
+#define C_LUCY_NOMATCHSCORER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/NoMatchScorer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_ORMATCHER
-#define C_KINO_ORSCORER
+#define C_LUCY_ORMATCHER
+#define C_LUCY_ORSCORER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/ORMatcher.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/ORQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/ORQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/ORQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/ORQuery.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_ORQUERY
-#define C_KINO_ORCOMPILER
+#define C_LUCY_ORQUERY
+#define C_LUCY_ORCOMPILER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/ORQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/PhraseQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PhraseQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PhraseQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PhraseQuery.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_PHRASEQUERY
-#define C_KINO_PHRASECOMPILER
+#define C_LUCY_PHRASEQUERY
+#define C_LUCY_PHRASECOMPILER
 #include <stdarg.h>
 
 #include "KinoSearch/Util/ToolSet.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/PhraseScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PhraseScorer.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PhraseScorer.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PhraseScorer.c Wed Nov  3 04:36:57 2010
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#define C_KINO_PHRASESCORER
-#define C_KINO_POSTING
-#define C_KINO_SCOREPOSTING
+#define C_LUCY_PHRASESCORER
+#define C_LUCY_POSTING
+#define C_LUCY_SCOREPOSTING
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/PhraseScorer.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/PolyMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PolyMatcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PolyMatcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PolyMatcher.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYMATCHER
+#define C_LUCY_POLYMATCHER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/PolyMatcher.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/PolyQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PolyQuery.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PolyQuery.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PolyQuery.c Wed Nov  3 04:36:57 2010
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYQUERY
-#define C_KINO_POLYCOMPILER
+#define C_LUCY_POLYQUERY
+#define C_LUCY_POLYCOMPILER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/PolyQuery.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_POLYSEARCHER
+#define C_LUCY_POLYSEARCHER
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/PolySearcher.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/Query.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Query.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Query.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Query.c Wed Nov  3 04:36:57 2010
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define C_KINO_QUERY
+#define C_LUCY_QUERY
 #include "KinoSearch/Util/ToolSet.h"
 
 #include "KinoSearch/Search/Query.h"

Modified: incubator/lucy/trunk/core/KinoSearch/Search/QueryParser.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/QueryParser.c?rev=1030328&r1=1030327&r2=1030328&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/QueryParser.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/QueryParser.c Wed Nov  3 04:36:57 2010
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define C_KINO_QUERYPARSER
-#define C_KINO_PARSERCLAUSE
-#define C_KINO_PARSERTOKEN
-#define C_KINO_VIEWCHARBUF
+#define C_LUCY_QUERYPARSER
+#define C_LUCY_PARSERCLAUSE
+#define C_LUCY_PARSERTOKEN
+#define C_LUCY_VIEWCHARBUF
 #include <stdlib.h>
 #include <ctype.h>
 #include "KinoSearch/Util/ToolSet.h"