Adjust for last change in ld-collate.c of adding alignment padding.

* locale/weight.h: Adjust for last change in ld-collate.c of adding
	alignment padding.
This commit is contained in:
Ulrich Drepper 2000-01-20 05:22:38 +00:00
parent 0295c6e90d
commit ee00109cd0
2 changed files with 10 additions and 0 deletions

View File

@ -5,6 +5,8 @@
characters. characters.
(collate_output): Correct various problems with alignment in the (collate_output): Correct various problems with alignment in the
output file. output file.
* locale/weight.h: Adjust for last change in ld-collate.c of adding
alignment padding.
* stdlib/strfmon.c: Don't report an error if final NUL is at the * stdlib/strfmon.c: Don't report an error if final NUL is at the
end of the buffer. Set errno correctly if floating-point number end of the buffer. Set errno correctly if floating-point number

View File

@ -68,6 +68,8 @@ findidx (const unsigned char **cpp)
/* Up to the next entry. */ /* Up to the next entry. */
cp += nhere; cp += nhere;
if ((1 + nhere) % __alignof__ (int32_t) != 0)
cp += __alignof__ (int32_t) - (1 + nhere) % __alignof__ (int32_t);
} }
else else
{ {
@ -86,6 +88,9 @@ findidx (const unsigned char **cpp)
{ {
/* Cannot be in this range. */ /* Cannot be in this range. */
cp += 2 * nhere; cp += 2 * nhere;
if ((1 + 2 * nhere) % __alignof__ (int32_t) != 0)
cp += (__alignof__ (int32_t)
- (1 + 2 * nhere) % __alignof__ (int32_t));
continue; continue;
} }
@ -98,6 +103,9 @@ findidx (const unsigned char **cpp)
{ {
/* Cannot be in this range. */ /* Cannot be in this range. */
cp += 2 * nhere; cp += 2 * nhere;
if ((1 + 2 * nhere) % __alignof__ (int32_t) != 0)
cp += (__alignof__ (int32_t)
- (1 + 2 * nhere) % __alignof__ (int32_t));
continue; continue;
} }