summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-25 08:47:01 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-25 08:47:01 +0000
commit657f0417ed66d26fa80bbf3ef7081c59e15fbdd6 (patch)
tree2a81a63681d647347cc17c154bf031e1de606fb9
parent81b215afa3ee76e03579108b866ef7bd696b42c6 (diff)
Update.
2003-06-25 Ulrich Drepper <drepper@redhat.com> * include/time.h: Don't define CLOCK_IDFIELD_SIZE if _ISOMAC is defined.
-rw-r--r--ChangeLog5
-rw-r--r--include/time.h4
-rw-r--r--localedata/ChangeLog5
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b586d44df7..28c84f37bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-25 Ulrich Drepper <drepper@redhat.com>
+
+ * include/time.h: Don't define CLOCK_IDFIELD_SIZE if _ISOMAC is
+ defined.
+
2003-06-11 Jakub Jelinek <jakub@redhat.com>
* 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 <pere@hungry.com>
+
+ * locales/no_NO [LC_COLLATE]: Add missing eth letter, sorted as
+ latin letter d.
+
2003-06-16 Bruno Haible <bruno@clisp.org>
* charmaps/ISO-8859-15: Add aliases ISO_8859-15, LATIN-9.