Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678

into  pilot.blaudden:/home/msvensson/mysql/bug26678/my51-bug26678
This commit is contained in:
unknown 2007-02-27 14:21:40 +01:00
commit 4131465ee5
2 changed files with 6 additions and 6 deletions

View File

@ -858,9 +858,9 @@ inline T1 SaturatingSubtract(T1 a, T2 b)
// declares
unsigned int BytePrecision(unsigned long value);
unsigned int BitPrecision(unsigned long);
unsigned long Crop(unsigned long value, unsigned int size);
unsigned int BytePrecision(word value);
unsigned int BitPrecision(word);
word Crop(word value, unsigned int size);

View File

@ -122,7 +122,7 @@ void xorbuf(byte* buf, const byte* mask, unsigned int count)
}
unsigned int BytePrecision(unsigned long value)
unsigned int BytePrecision(word value)
{
unsigned int i;
for (i=sizeof(value); i; --i)
@ -133,7 +133,7 @@ unsigned int BytePrecision(unsigned long value)
}
unsigned int BitPrecision(unsigned long value)
unsigned int BitPrecision(word value)
{
if (!value)
return 0;
@ -154,7 +154,7 @@ unsigned int BitPrecision(unsigned long value)
}
unsigned long Crop(unsigned long value, unsigned int size)
word Crop(word value, unsigned int size)
{
if (size < 8*sizeof(value))
return (value & ((1L << size) - 1));