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 2006/10/25 23:42:05 UTC
svn commit: r467773 - in /lucene/lucy/trunk/charmonizer/src/Charmonizer:
Modules/Integers.charm Modules/Integers.harm Test/Integers.charm
Author: marvin
Date: Wed Oct 25 14:42:05 2006
New Revision: 467773
URL: http://svn.apache.org/viewvc?view=rev&rev=467773
Log:
Change BIG_ENDIAN to BIG_END and LITTLE_ENDIAN to LITTLE_END, because of a
namespace collision on Darwin.
Modified:
lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.charm?view=diff&rev=467773&r1=467772&r2=467773
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.charm Wed Oct 25 14:42:05 2006
@@ -70,9 +70,9 @@
/* document endian-ness */
if (machine_is_big_endian())
- append_conf(conf_fh, "#define %sBIG_ENDIAN\n", constant_prefix);
+ append_conf(conf_fh, "#define %sBIG_END\n", constant_prefix);
else
- append_conf(conf_fh, "#define %sLITTLE_ENDIAN\n", constant_prefix);
+ append_conf(conf_fh, "#define %sLITTLE_END\n", constant_prefix);
/* Record sizeof() for several common integer types. */
output = capture_output(sizes_code, strlen(sizes_code), &output_len);
@@ -241,9 +241,9 @@
Start_Short_Names(conf_fh);
if (machine_is_big_endian())
- shorten_constant(conf_fh, "BIG_ENDIAN");
+ shorten_constant(conf_fh, "BIG_END");
else
- shorten_constant(conf_fh, "LITTLE_ENDIAN");
+ shorten_constant(conf_fh, "LITTLE_END");
shorten_constant(conf_fh, "SIZEOF_CHAR");
shorten_constant(conf_fh, "SIZEOF_SHORT");
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.harm?view=diff&rev=467773&r1=467772&r2=467773
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Modules/Integers.harm Wed Oct 25 14:42:05 2006
@@ -1,9 +1,10 @@
/* Charmonizer/Modules/Integers.h -- info about integer types and sizes.
*
- * One or the other of these will be defined.
+ * One or the other of these will be defined, depending on whether the
+ * processor is big-endian or little-endian.
*
- * BIG_ENDIAN
- * LITTLE_ENDIAN
+ * BIG_END
+ * LITTLE_END
*
* These will always be defined:
*
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm?view=diff&rev=467773&r1=467772&r2=467773
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm Wed Oct 25 14:42:05 2006
@@ -18,13 +18,13 @@
{
long one= 1;
long big_endian = !(*((char *)(&one)));
-#ifdef BIG_ENDIAN
- Assert_True(big_endian, "BIG_ENDIAN");
+#ifdef BIG_END
+ Assert_True(big_endian, "BIG_END");
#else
#if defined(LITTLE_ENDIAN)
- Assert_True(!big_endian, "LITTLE_ENDIAN");
+ Assert_True(!big_endian, "LITTLE_END");
#else
- Assert_True(0, "Either BIG_ENDIAN nor LITTLE_ENDIAN should be defined");
+ Assert_True(0, "Either BIG_END or LITTLE_END should be defined");
#endif
#endif
}