You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/05/28 19:47:45 UTC
[lucy-commits] [12/19] git commit: refs/heads/separate-clownfish-wip1 - Change some
more prefixes
Change some more prefixes
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6bc37020
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6bc37020
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6bc37020
Branch: refs/heads/separate-clownfish-wip1
Commit: 6bc37020bf7a93d10b7e24e9b2c3ace5da9980d8
Parents: cb1f2cf
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 27 19:04:27 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue May 28 17:07:28 2013 +0200
----------------------------------------------------------------------
core/Clownfish/CharBuf.cfh | 2 +-
core/Clownfish/Err.cfh | 4 ++--
core/Clownfish/Obj.cfh | 2 +-
core/Clownfish/Util/Atomic.cfh | 2 +-
core/Clownfish/Util/Memory.cfh | 2 +-
core/Clownfish/Util/NumberUtils.cfh | 2 +-
core/Clownfish/Util/StringHelper.cfh | 2 +-
core/Clownfish/VArray.cfh | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/CharBuf.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/CharBuf.cfh b/core/Clownfish/CharBuf.cfh
index c1c7918..2601f6a 100644
--- a/core/Clownfish/CharBuf.cfh
+++ b/core/Clownfish/CharBuf.cfh
@@ -395,7 +395,7 @@ __C__
#define CFISH_ZCB_WRAP_STR(ptr, size) \
cfish_ZCB_wrap_str(alloca(cfish_ZCB_size()), ptr, size)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define ZCB_BLANK CFISH_ZCB_BLANK
#define ZCB_WRAP CFISH_ZCB_WRAP
#define ZCB_WRAP_STR CFISH_ZCB_WRAP_STR
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Err.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Err.cfh b/core/Clownfish/Err.cfh
index 584ba14..7bc4f86 100644
--- a/core/Clownfish/Err.cfh
+++ b/core/Clownfish/Err.cfh
@@ -20,7 +20,7 @@ __C__
typedef void
(*Cfish_Err_Attempt_t)(void *context);
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define Err_Attempt_t Cfish_Err_Attempt_t
#endif
__END_C__
@@ -241,7 +241,7 @@ cfish_Err_abstract_class_check(cfish_Obj *obj, cfish_VTable *vtable) {
#define CFISH_ABSTRACT_CLASS_CHECK(_obj, _vtable) \
cfish_Err_abstract_class_check(((cfish_Obj*)_obj), _vtable)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define THROW CFISH_THROW
#define RETHROW CFISH_RETHROW
#define WARN CFISH_WARN
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Obj.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Obj.cfh b/core/Clownfish/Obj.cfh
index ce4d812..55e10cd 100644
--- a/core/Clownfish/Obj.cfh
+++ b/core/Clownfish/Obj.cfh
@@ -213,7 +213,7 @@ cfish_Obj_decref(cfish_Obj *self) {
#define CFISH_DECREF(_self) cfish_Obj_decref((cfish_Obj*)_self)
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define SUPER_DESTROY(_self, _vtable) CFISH_SUPER_DESTROY(_self, _vtable)
#define INCREF(_self) CFISH_INCREF(_self)
#define DECREF(_self) CFISH_DECREF(_self)
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Util/Atomic.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Atomic.cfh b/core/Clownfish/Util/Atomic.cfh
index 51822f7..d9d20c4 100644
--- a/core/Clownfish/Util/Atomic.cfh
+++ b/core/Clownfish/Util/Atomic.cfh
@@ -100,7 +100,7 @@ cfish_Atomic_cas_ptr(void *volatile *target, void *old_value, void *new_value) {
#endif // Big platform if-else chain.
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define Atomic_cas_ptr cfish_Atomic_cas_ptr
#endif
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Util/Memory.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Memory.cfh b/core/Clownfish/Util/Memory.cfh
index 6636972..93df35d 100644
--- a/core/Clownfish/Util/Memory.cfh
+++ b/core/Clownfish/Util/Memory.cfh
@@ -61,7 +61,7 @@ __C__
#define CFISH_REALLOCATE cfish_Memory_wrapped_realloc
#define CFISH_FREEMEM cfish_Memory_wrapped_free
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define MALLOCATE CFISH_MALLOCATE
#define CALLOCATE CFISH_CALLOCATE
#define REALLOCATE CFISH_REALLOCATE
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Util/NumberUtils.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/NumberUtils.cfh b/core/Clownfish/Util/NumberUtils.cfh
index c2a281e..cd6c750 100644
--- a/core/Clownfish/Util/NumberUtils.cfh
+++ b/core/Clownfish/Util/NumberUtils.cfh
@@ -464,7 +464,7 @@ cfish_NumUtil_u4set(void *array, uint32_t tick, uint8_t value) {
ints[(tick >> 1)] = (ints[(tick >> 1)] & ~mask) | new_bits;
}
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define C32_MAX_BYTES CFISH_NUMUTIL_C32_MAX_BYTES
#define C64_MAX_BYTES CFISH_NUMUTIL_C64_MAX_BYTES
#endif
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/Util/StringHelper.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/StringHelper.cfh b/core/Clownfish/Util/StringHelper.cfh
index 896e309..482666f 100644
--- a/core/Clownfish/Util/StringHelper.cfh
+++ b/core/Clownfish/Util/StringHelper.cfh
@@ -75,7 +75,7 @@ __C__
* terminating NULL.
*/
#define cfish_StrHelp_MAX_BASE36_BYTES 14
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define StrHelp_MAX_BASE36_BYTES cfish_StrHelp_MAX_BASE36_BYTES
#endif
__END_C__
http://git-wip-us.apache.org/repos/asf/lucy/blob/6bc37020/core/Clownfish/VArray.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.cfh b/core/Clownfish/VArray.cfh
index 0ce4726..f64b8b5 100644
--- a/core/Clownfish/VArray.cfh
+++ b/core/Clownfish/VArray.cfh
@@ -22,7 +22,7 @@ __C__
typedef bool
(*Cfish_VA_Gather_Test_t)(cfish_VArray *self, uint32_t tick, void *data);
-#ifdef LUCY_USE_SHORT_NAMES
+#ifdef CFISH_USE_SHORT_NAMES
#define VA_Gather_Test_t Cfish_VA_Gather_Test_t
#endif
__END_C__