diff options
| -rw-r--r-- | localedata/ChangeLog | 3 | ||||
| -rw-r--r-- | localedata/locales/oc_FR | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 40ddfdc157..1f4b1ee577 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,8 @@ 2007-10-01 Ulrich Drepper <drepper@redhat.com> + [BZ #4941] + * locales/oc_FR: Fix Thursday abday and August mon and abmon data. + * SUPPORTED (SUPPORTED-LOCALES): Add ber_MA.UTF-8. * locales/am_ET (LC_COLLATE): Define new script after copy. diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR index 97dfc8d90d..156f81243f 100644 --- a/localedata/locales/oc_FR +++ b/localedata/locales/oc_FR @@ -91,7 +91,7 @@ END LC_TELEPHONE LC_TIME abday "<U0064><U0069><U006D>";"<U006C><U0075><U006E>";/ "<U006D><U0061><U0072>";"<U006D><U0065><U0063>";/ - "<U006A><U00F3><U0075>";"<U0076><U0065><U006E>";/ + "<U006A><U00F2><U0075>";"<U0076><U0065><U006E>";/ "<U0073><U0061><U0062>" day "<U0064><U0069><U006D><U0065><U006E><U0067><U0065>";/ "<U0064><U0069><U006C><U0075><U006E><U0073>";/ @@ -103,7 +103,7 @@ day "<U0064><U0069><U006D><U0065><U006E><U0067><U0065>";/ abmon "<U0067><U0065><U006E>";"<U0066><U0065><U0062>";/ "<U006D><U0061><U0072>";"<U0061><U0062><U0072>";/ "<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/ - "<U006A><U0075><U006C>";"<U0061><U0067><U00F3>";/ + "<U006A><U0075><U006C>";"<U0061><U0067><U006F>";/ "<U0073><U0065><U0074>";"<U006F><U0063><U0074>";/ "<U006E><U006F><U0076>";"<U0064><U0065><U0063>" mon "<U0067><U0065><U006E><U0069><U00E8><U0072>";/ @@ -113,7 +113,7 @@ mon "<U0067><U0065><U006E><U0069><U00E8><U0072>";/ "<U006D><U0061><U0069>";/ "<U006A><U0075><U006E><U0068>";/ "<U006A><U0075><U006C><U0068><U0065><U0074>";/ - "<U0061><U0067><U00F3><U0073><U0074>";/ + "<U0061><U0067><U006F><U0073><U0074>";/ "<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U0065>";/ "<U006F><U0063><U0074><U006F><U0062><U0072><U0065>";/ "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/ diff --git a/malloc/malloc.c b/malloc/malloc.c index 0755fd8f8d..39d5b3fa52 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3503,6 +3503,10 @@ mremap_chunk(p, new_size) mchunkptr p; size_t new_size; /* Note the extra SIZE_SZ overhead as in mmap_chunk(). */ new_size = (new_size + offset + SIZE_SZ + page_mask) & ~page_mask; + /* No need to remap if the number of pages does not change. */ + if (size + offset == new_size) + return p; + cp = (char *)mremap((char *)p - offset, size + offset, new_size, MREMAP_MAYMOVE); |