diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-10-03 21:51:32 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-10-03 21:51:32 +0000 |
| commit | 975569d0d953fb8940d23af83ce9f9765b2b07ae (patch) | |
| tree | 51ada8cd6216f789ed6775eeedb5d0c2a72af202 /locale/weight.h | |
| parent | bc543b02c78ead13ea558a00b51f83079cbabda9 (diff) | |
| download | glibc-975569d0d953fb8940d23af83ce9f9765b2b07ae.tar.gz glibc-975569d0d953fb8940d23af83ce9f9765b2b07ae.tar.xz glibc-975569d0d953fb8940d23af83ce9f9765b2b07ae.zip | |
Remove locale file dependence on int32_t alignment.
Diffstat (limited to 'locale/weight.h')
| -rw-r--r-- | locale/weight.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/locale/weight.h b/locale/weight.h index 645eda2fe9..b097aaca0b 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -69,8 +69,8 @@ findidx (const unsigned char **cpp, size_t len) /* Up to the next entry. */ cp += nhere; - if ((1 + nhere) % __alignof__ (int32_t) != 0) - cp += __alignof__ (int32_t) - (1 + nhere) % __alignof__ (int32_t); + if (!LOCFILE_ALIGNED_P (1 + nhere)) + cp += LOCFILE_ALIGN - (1 + nhere) % LOCFILE_ALIGN; } else { @@ -89,9 +89,9 @@ findidx (const unsigned char **cpp, size_t len) { /* Cannot be in this range. */ cp += 2 * nhere; - if ((1 + 2 * nhere) % __alignof__ (int32_t) != 0) - cp += (__alignof__ (int32_t) - - (1 + 2 * nhere) % __alignof__ (int32_t)); + if (!LOCFILE_ALIGNED_P (1 + 2 * nhere)) + cp += (LOCFILE_ALIGN + - (1 + 2 * nhere) % LOCFILE_ALIGN); continue; } @@ -104,9 +104,9 @@ findidx (const unsigned char **cpp, size_t len) { /* Cannot be in this range. */ cp += 2 * nhere; - if ((1 + 2 * nhere) % __alignof__ (int32_t) != 0) - cp += (__alignof__ (int32_t) - - (1 + 2 * nhere) % __alignof__ (int32_t)); + if (!LOCFILE_ALIGNED_P (1 + 2 * nhere)) + cp += (LOCFILE_ALIGN + - (1 + 2 * nhere) % LOCFILE_ALIGN); continue; } |