Update.

	* sysdeps/unix/i386/i586/clock_nanosleep.c (CLOCK_P): Remove
	CLOCK_MONOTONIC.
	* sysdeps/unix/i386/i586/clock_gettime.c (EXTRA_CLOCK_CASES): Likewise.
	* sysdeps/unix/i386/i586/clock_getres.c (EXTRA_CLOCK_CASES): Likewise.

5 files changed, 15 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d52b8bddb..6b7d10c597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-09-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/i386/i586/clock_nanosleep.c (CLOCK_P): Remove
+	CLOCK_MONOTONIC.
+	* sysdeps/unix/i386/i586/clock_gettime.c (EXTRA_CLOCK_CASES): Likewise.
+	* sysdeps/unix/i386/i586/clock_getres.c (EXTRA_CLOCK_CASES): Likewise.
+
 	* sysdeps/unix/sysv/linux/i386/bits/time.h: Remove CLOCK_MONOTONIC.
 
 2000-09-26  Jakub Jelinek  <jakub@redhat.com>
diff --git a/manual/charset.texi b/manual/charset.texi
index aa4c2670c3..deae7af08a 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -298,15 +298,15 @@ adequately are a thing of the past.
 
 One final comment about the choice of the wide character representation
 is necessary at this point.  We have said above that the natural choice
-is using Unicode or @w{ISO 10646}.  This is not specified in any
-standard, though.  The @w{ISO C} standard does not specify anything
-specific about the @code{wchar_t} type.  There might be systems where
-the developers decided differently.  Therefore one should as much as
-possible avoid making assumption about the wide character representation
-although GNU systems will always work as described above.  If the
-programmer uses only the functions provided by the C library to handle
-wide character strings there should not be any compatibility problems
-with other systems.
+is using Unicode or @w{ISO 10646}.  This is not required, but at least
+encouraged, by the @w{ISO C} standard.  The standard defines at least a
+macro @code{__STDC_ISO_10646__} that is only defined on systems where
+the @code{wchar_t} type encodes @w{ISO 10646} characters.  If this
+symbol is not defined one should as much as possible avoid making
+assumption about the wide character representation.  If the programmer
+uses only the functions provided by the C library to handle wide
+character strings there should not be any compatibility problems with
+other systems.
 
 @node Charset Function Overview
 @section Overview about Character Handling Functions
diff --git a/sysdeps/unix/i386/i586/clock_getres.c b/sysdeps/unix/i386/i586/clock_getres.c
index 2ea21a0f8e..49986f85ab 100644
--- a/sysdeps/unix/i386/i586/clock_getres.c
+++ b/sysdeps/unix/i386/i586/clock_getres.c
@@ -47,7 +47,6 @@ static long int nsec;
 #define EXTRA_CLOCK_CASES \
   case CLOCK_PROCESS_CPUTIME_ID:					      \
   case CLOCK_THREAD_CPUTIME_ID:						      \
-  case CLOCK_MONOTONIC:							      \
     {									      \
       if (__builtin_expect (nsec == 0, 0))				      \
 	{								      \
diff --git a/sysdeps/unix/i386/i586/clock_gettime.c b/sysdeps/unix/i386/i586/clock_gettime.c
index 38f7c4ab15..5d0e9f4c60 100644
--- a/sysdeps/unix/i386/i586/clock_gettime.c
+++ b/sysdeps/unix/i386/i586/clock_gettime.c
@@ -46,7 +46,6 @@ static unsigned long long int freq;
 #define EXTRA_CLOCK_CASES \
   case CLOCK_PROCESS_CPUTIME_ID:					      \
   case CLOCK_THREAD_CPUTIME_ID:						      \
-  case CLOCK_MONOTONIC:							      \
     {									      \
       unsigned long long int tsc;					      \
 									      \
diff --git a/sysdeps/unix/i386/i586/clock_nanosleep.c b/sysdeps/unix/i386/i586/clock_nanosleep.c
index 8cd3d4dec3..a1250cc4bb 100644
--- a/sysdeps/unix/i386/i586/clock_nanosleep.c
+++ b/sysdeps/unix/i386/i586/clock_nanosleep.c
@@ -20,7 +20,6 @@
 /* Additional definitions for the x86 version.  */
 #define CLOCK_P(clock) \
   (clock) != CLOCK_PROCESS_CPUTIME_ID					      \
-  && (clock) != CLOCK_THREAD_CPUTIME_ID					      \
-  &&  (clock) != CLOCK_MONOTONIC
+  && (clock) != CLOCK_THREAD_CPUTIME_ID
 
 #include <sysdeps/unix/clock_nanosleep.c>