From 657f0417ed66d26fa80bbf3ef7081c59e15fbdd6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 25 Jun 2003 08:47:01 +0000 Subject: Update. 2003-06-25 Ulrich Drepper * include/time.h: Don't define CLOCK_IDFIELD_SIZE if _ISOMAC is defined. --- ChangeLog | 5 +++++ include/time.h | 4 +++- localedata/ChangeLog | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b586d44df7..28c84f37bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-25 Ulrich Drepper + + * include/time.h: Don't define CLOCK_IDFIELD_SIZE if _ISOMAC is + defined. + 2003-06-11 Jakub Jelinek * elf/Versions (libc): Add _dl_open_hook@GLIBC_PRIVATE. diff --git a/include/time.h b/include/time.h index b501bfd3de..87e0f08f8d 100644 --- a/include/time.h +++ b/include/time.h @@ -86,6 +86,8 @@ extern int __getclktck (void); /* Use in the clock_* functions. Size of the field representing the actual clock ID. */ -#define CLOCK_IDFIELD_SIZE 3 +#ifndef _ISOMAC +# define CLOCK_IDFIELD_SIZE 3 +#endif #endif #endif diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 0bf60e9269..6cdbd1c388 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2003-06-21 Petter Reinholdtsen + + * locales/no_NO [LC_COLLATE]: Add missing eth letter, sorted as + latin letter d. + 2003-06-16 Bruno Haible * charmaps/ISO-8859-15: Add aliases ISO_8859-15, LATIN-9. -- cgit v1.2.3