Update.

2003-06-25  Ulrich Drepper  <drepper@redhat.com>

	* include/time.h: Don't define CLOCK_IDFIELD_SIZE if _ISOMAC is
	defined.

diff --git a/ChangeLog b/ChangeLog
index b586d44df7a66e1884a4f6fbaa28979188e788f4..28c84f37bfa33e570b380f777999e7b644095e37 100644 (file)
--- 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 b501bfd3de0350c9226a00d6142985a2e48b3a0e..87e0f08f8de52d494644a5cf3722c6cfa2148a97 100644 (file)
--- 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 0bf60e9269f2899dc36235803a0585db31260834..6cdbd1c388edb602fc67f55978bff90fecff5b6b 100644 (file)
--- 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.