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 06:17:57 UTC
[lucy-commits] svn commit: r1030336 - in /incubator/lucy/trunk:
clownfish/lib/Clownfish/Binding/Core/ core/KinoSearch/
core/KinoSearch/Analysis/ core/KinoSearch/Index/Posting/
core/KinoSearch/Object/ core/KinoSearch/Plan/ core/KinoSearch/Search/
core/KinoSearch/Store...
Author: marvin
Date: Wed Nov 3 05:17:55 2010
New Revision: 1030336
URL: http://svn.apache.org/viewvc?rev=1030336&view=rev
Log:
Hack Clownfish temporarily to force KINO_USE_SHORT_NAMES to
LUCY_USE_SHORT_NAMES.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Class.pm
incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.cfh
incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.cfh
incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c
incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c
incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh
incubator/lucy/trunk/core/KinoSearch/Object/Err.c
incubator/lucy/trunk/core/KinoSearch/Object/Err.cfh
incubator/lucy/trunk/core/KinoSearch/Object/Hash.c
incubator/lucy/trunk/core/KinoSearch/Object/Host.cfh
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/Obj.cfh
incubator/lucy/trunk/core/KinoSearch/Object/VArray.c
incubator/lucy/trunk/core/KinoSearch/Object/VArray.cfh
incubator/lucy/trunk/core/KinoSearch/Object/VTable.c
incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh
incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c
incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.cfh
incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.cfh
incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.cfh
incubator/lucy/trunk/core/KinoSearch/Test.cfh
incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.cfh
incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.cfh
incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c
incubator/lucy/trunk/core/KinoSearch/Util/Atomic.cfh
incubator/lucy/trunk/core/KinoSearch/Util/Debug.c
incubator/lucy/trunk/core/KinoSearch/Util/Debug.cfh
incubator/lucy/trunk/core/KinoSearch/Util/Freezer.cfh
incubator/lucy/trunk/core/KinoSearch/Util/Memory.c
incubator/lucy/trunk/core/KinoSearch/Util/Memory.cfh
incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c
incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.cfh
incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.cfh
incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c
incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c
incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.cfh
incubator/lucy/trunk/core/KinoSearch/Util/ToolSet.h
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Core/Aliases.pm Wed Nov 3 05:17:55 2010
@@ -65,7 +65,7 @@ our %aliases = (
cfish_Host_callback_obj => 'kino_Host_callback_obj',
cfish_Host_callback_str => 'kino_Host_callback_str',
- CFISH_USE_SHORT_NAMES => 'KINO_USE_SHORT_NAMES',
+ CFISH_USE_SHORT_NAMES => 'LUCY_USE_SHORT_NAMES',
);
sub c_aliases {
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=1030336&r1=1030335&r2=1030336&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 05:17:55 2010
@@ -39,7 +39,14 @@ sub new {
sub _full_callbacks_var { shift->{client}->full_vtable_var . '_CALLBACKS' }
sub _full_name_var { shift->{client}->full_vtable_var . '_CLASS_NAME' }
-sub _short_names_macro { shift->{client}->get_PREFIX . 'USE_SHORT_NAMES' }
+#sub _short_names_macro { shift->{client}->get_PREFIX . 'USE_SHORT_NAMES' }
+
+# Temporary hack.
+sub _short_names_macro {
+ my $macro = shift->{client}->get_PREFIX . 'USE_SHORT_NAMES';
+ $macro =~ s/KINO/LUCY/;
+ return $macro;
+}
# C code defining the ZombieCharBuf which contains the class name for this
# class.
Modified: incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Analysis/Stemmer.cfh Wed Nov 3 05:17:55 2010
@@ -33,7 +33,7 @@ extern lucy_Stemmer_sb_stemmer_new_t
extern lucy_Stemmer_sb_stemmer_delete_t lucy_Stemmer_sb_stemmer_delete;
extern lucy_Stemmer_sb_stemmer_stem_t lucy_Stemmer_sb_stemmer_stem;
extern lucy_Stemmer_sb_stemmer_length_t lucy_Stemmer_sb_stemmer_length;
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define Stemmer_sb_stemmer_new_t lucy_Stemmer_sb_stemmer_new_t
#define Stemmer_sb_stemmer_delete_t lucy_Stemmer_sb_stemmer_delete_t
#define Stemmer_sb_stemmer_stem_t lucy_Stemmer_sb_stemmer_stem_t
Modified: incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Index/Posting/RawPosting.cfh Wed Nov 3 05:17:55 2010
@@ -95,7 +95,7 @@ class KinoSearch::Index::Posting::RawPos
__C__
extern kino_RawPosting LUCY_RAWPOSTING_BLANK;
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define RAWPOSTING_BLANK LUCY_RAWPOSTING_BLANK
#endif
__END_C__
Modified: incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/ByteBuf.c Wed Nov 3 05:17:55 2010
@@ -16,7 +16,7 @@
#define C_LUCY_BYTEBUF
#define C_LUCY_VIEWBYTEBUF
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <stdlib.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.c Wed Nov 3 05:17:55 2010
@@ -17,7 +17,7 @@
#define C_LUCY_CHARBUF
#define C_LUCY_VIEWCHARBUF
#define C_LUCY_ZOMBIECHARBUF
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/CharBuf.cfh Wed Nov 3 05:17:55 2010
@@ -392,7 +392,7 @@ __C__
extern kino_ZombieCharBuf KINO_ZCB_EMPTY;
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define ZCB_BLANK KINO_ZCB_BLANK
#define ZCB_LITERAL(_string) KINO_ZCB_LITERAL(_string)
#define EMPTY KINO_ZCB_EMPTY
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Err.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Err.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Err.c Wed Nov 3 05:17:55 2010
@@ -17,7 +17,7 @@
#define C_LUCY_ERR
#define C_LUCY_OBJ
#define C_LUCY_VTABLE
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Err.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Err.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Err.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Err.cfh Wed Nov 3 05:17:55 2010
@@ -224,7 +224,7 @@ kino_Err_abstract_class_check(kino_Obj *
#define CFISH_ABSTRACT_CLASS_CHECK(_obj, _vtable) \
kino_Err_abstract_class_check(((kino_Obj*)_obj), _vtable)
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define THROW CFISH_THROW
#define RETHROW CFISH_RETHROW
#define WARN CFISH_WARN
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Hash.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Hash.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Hash.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Hash.c Wed Nov 3 05:17:55 2010
@@ -16,7 +16,7 @@
#define C_LUCY_HASH
#define C_LUCY_HASHTOMBSTONE
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Host.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Host.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Host.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Host.cfh Wed Nov 3 05:17:55 2010
@@ -38,7 +38,7 @@ __C__
#define CFISH_ARG_OBJ(_label, _value) \
CFISH_HOST_ARGTYPE_OBJ, (_label), ((kino_Obj*)_value)
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define ARG_I32 CFISH_ARG_I32
#define ARG_I64 CFISH_ARG_I64
#define ARG_F32 CFISH_ARG_F32
Modified: incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/LockFreeRegistry.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_LOCKFREEREGISTRY
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Object/LockFreeRegistry.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Num.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Num.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Num.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Num.c Wed Nov 3 05:17:55 2010
@@ -21,7 +21,7 @@
#define C_LUCY_INTEGER64
#define C_LUCY_FLOAT32
#define C_LUCY_FLOAT64
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Object/Num.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Obj.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Obj.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Obj.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Obj.c Wed Nov 3 05:17:55 2010
@@ -16,7 +16,7 @@
#define C_LUCY_OBJ
#define C_LUCY_VTABLE
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <stdlib.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Object/Obj.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/Obj.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/Obj.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/Obj.cfh Wed Nov 3 05:17:55 2010
@@ -215,7 +215,7 @@ kino_Obj_decref(kino_Obj *self)
#define LUCY_DECREF(_self) kino_Obj_decref((kino_Obj*)_self)
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define SUPER_DESTROY(_self, _vtable) KINO_SUPER_DESTROY(_self, _vtable)
#define INCREF(_self) LUCY_INCREF(_self)
#define DECREF(_self) LUCY_DECREF(_self)
Modified: incubator/lucy/trunk/core/KinoSearch/Object/VArray.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/VArray.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/VArray.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/VArray.c Wed Nov 3 05:17:55 2010
@@ -18,7 +18,7 @@
#include <string.h>
#include <stdlib.h>
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Object/VTable.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Object/VArray.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/VArray.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/VArray.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/VArray.cfh Wed Nov 3 05:17:55 2010
@@ -22,7 +22,7 @@ __C__
typedef chy_bool_t
(*lucy_VA_gather_test_t)(kino_VArray *self, uint32_t tick, void *data);
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define lucy_VA_gather_test_t lucy_VA_gather_test_t
#endif
__END_C__
Modified: incubator/lucy/trunk/core/KinoSearch/Object/VTable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Object/VTable.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Object/VTable.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Object/VTable.c Wed Nov 3 05:17:55 2010
@@ -16,7 +16,7 @@
#define C_LUCY_VTABLE
#define C_LUCY_OBJ
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh Wed Nov 3 05:17:55 2010
@@ -26,7 +26,7 @@ __C__
#define kino_FType_FLOAT64 6
#define kino_FType_PRIMITIVE_ID_MASK 0x7
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define FType_TEXT kino_FType_TEXT
#define FType_BLOB kino_FType_BLOB
#define FType_INT32 kino_FType_INT32
Modified: incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/Matcher.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_MATCHER
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Search/Matcher.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/ORMatcher.cfh Wed Nov 3 05:17:55 2010
@@ -26,7 +26,7 @@ typedef struct kino_HeapedMatcherDoc {
int32_t doc;
} kino_HeapedMatcherDoc;
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define HeapedMatcherDoc kino_HeapedMatcherDoc
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/TermScorer.cfh Wed Nov 3 05:17:55 2010
@@ -49,7 +49,7 @@ class KinoSearch::Search::TermScorer inh
__C__
#define LUCY_TERMSCORER_SCORE_CACHE_SIZE 32
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define TERMSCORER_SCORE_CACHE_SIZE LUCY_TERMSCORER_SCORE_CACHE_SIZE
#endif
__END_C__
Modified: incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Store/FileHandle.cfh Wed Nov 3 05:17:55 2010
@@ -141,7 +141,7 @@ extern int32_t kino_FH_object_count;
// Default size for the memory buffer used by both InStream and OutStream.
#define KINO_IO_STREAM_BUF_SIZE 1024
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define FH_object_count kino_FH_object_count
#define IO_STREAM_BUF_SIZE KINO_IO_STREAM_BUF_SIZE
#define FH_READ_ONLY KINO_FH_READ_ONLY
Modified: incubator/lucy/trunk/core/KinoSearch/Test.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Test.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Test.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Test.cfh Wed Nov 3 05:17:55 2010
@@ -94,7 +94,7 @@ class KinoSearch::Test::TestBatch inheri
}
__C__
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define TEST_TRUE kino_TestBatch_test_true
#define TEST_FALSE kino_TestBatch_test_false
#define TEST_INT_EQ kino_TestBatch_test_int_equals
Modified: incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Test/Store/TestFolderCommon.cfh Wed Nov 3 05:17:55 2010
@@ -21,7 +21,7 @@ typedef kino_Folder*
lucy_TestFolderCommon_set_up_t(void);
typedef void
lucy_TestFolderCommon_tear_down_t(void);
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define TestFolderCommon_set_up_t lucy_TestFolderCommon_set_up_t
#define TestFolderCommon_tear_down_t lucy_TestFolderCommon_tear_down_t
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Test/TestUtils.cfh Wed Nov 3 05:17:55 2010
@@ -107,7 +107,7 @@ __C__
#define LUCY_TESTUTILS_BOOLOP_OR 1
#define LUCY_TESTUTILS_BOOLOP_AND 2
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define BOOLOP_OR LUCY_TESTUTILS_BOOLOP_OR
#define BOOLOP_AND LUCY_TESTUTILS_BOOLOP_AND
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Atomic.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_ATOMIC
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#include "KinoSearch/Util/Atomic.h"
/********************************** Windows ********************************/
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Atomic.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Atomic.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Atomic.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Atomic.cfh Wed Nov 3 05:17:55 2010
@@ -90,7 +90,7 @@ lucy_Atomic_cas_ptr(void *volatile *targ
#endif // Big platform if-else chain.
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define Atomic_cas_ptr lucy_Atomic_cas_ptr
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Debug.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Debug.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Debug.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Debug.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_DEBUG
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Util/Debug.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Debug.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Debug.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Debug.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Debug.cfh Wed Nov 3 05:17:55 2010
@@ -130,7 +130,7 @@ static void LUCY_ASSERT(int _ignore_me,
#endif // LUCY_DEBUG
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define DEBUG_ENABLED LUCY_DEBUG_ENABLED
#define DEBUG_PRINT LUCY_DEBUG_PRINT
#define DEBUG_DO LUCY_DEBUG_DO
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Freezer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Freezer.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Freezer.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Freezer.cfh Wed Nov 3 05:17:55 2010
@@ -36,7 +36,7 @@ __C__
#define LUCY_THAW(_instream) \
kino_Freezer_thaw(instream)
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define FREEZE LUCY_FREEZE
#define THAW LUCY_THAW
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Memory.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Memory.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Memory.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Memory.c Wed Nov 3 05:17:55 2010
@@ -17,7 +17,7 @@
#define C_LUCY_MEMORY
#include <stdlib.h>
#include <stdio.h>
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Util/Memory.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Util/Memory.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/Memory.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/Memory.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/Memory.cfh Wed Nov 3 05:17:55 2010
@@ -61,7 +61,7 @@ __C__
#define LUCY_REALLOCATE kino_Memory_wrapped_realloc
#define LUCY_FREEMEM kino_Memory_wrapped_free
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define MALLOCATE LUCY_MALLOCATE
#define CALLOCATE LUCY_CALLOCATE
#define REALLOCATE LUCY_REALLOCATE
Modified: incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_NUMBERUTILS
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/NumberUtils.cfh Wed Nov 3 05:17:55 2010
@@ -486,7 +486,7 @@ kino_NumUtil_u4set(void *array, uint32_t
ints[(tick >> 1)] = (ints[(tick >> 1)] & ~mask) | new_bits;
}
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define C32_MAX_BYTES LUCY_NUMUTIL_C32_MAX_BYTES
#define C64_MAX_BYTES LUCY_NUMUTIL_C64_MAX_BYTES
#endif
Modified: incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/SortExternal.cfh Wed Nov 3 05:17:55 2010
@@ -22,7 +22,7 @@ __C__
#include "KinoSearch/Util/SortUtils.h"
#define LUCY_SORTEX_DEFAULT_MEM_THRESHOLD 0x1000000
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define SORTEX_DEFAULT_MEM_THRESHOLD LUCY_SORTEX_DEFAULT_MEM_THRESHOLD
#endif
__END_C__
Modified: incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/SortUtils.c Wed Nov 3 05:17:55 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_SORTUTILS
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include <string.h>
Modified: incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.c Wed Nov 3 05:17:55 2010
@@ -17,7 +17,7 @@
#define C_LUCY_STRINGHELPER
#include <string.h>
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "KinoSearch/Util/StringHelper.h"
Modified: incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.cfh?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/StringHelper.cfh Wed Nov 3 05:17:55 2010
@@ -75,7 +75,7 @@ __C__
* terminating NULL.
*/
#define lucy_StrHelp_MAX_BASE36_BYTES 14
-#ifdef KINO_USE_SHORT_NAMES
+#ifdef LUCY_USE_SHORT_NAMES
#define StrHelp_MAX_BASE36_BYTES lucy_StrHelp_MAX_BASE36_BYTES
#endif
__END_C__
Modified: incubator/lucy/trunk/core/KinoSearch/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Util/ToolSet.h?rev=1030336&r1=1030335&r2=1030336&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Util/ToolSet.h (original)
+++ incubator/lucy/trunk/core/KinoSearch/Util/ToolSet.h Wed Nov 3 05:17:55 2010
@@ -28,7 +28,7 @@ extern "C" {
* header files, so that the header files remain as sparse as possible.
*/
-#define KINO_USE_SHORT_NAMES
+#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
#include "charmony.h"