Update.

2000-11-02  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/s390/bits/time.h: Removed.

	of unary ~ to size_t.
	skip the entire translit section, not only one line.  Remove dead test
	for tok_translit_end.  Enqueue include statements into a list.
	* intl/Makefile: Add rules to build, run and, distribute tst-gettext2.

2 files changed, 8 insertions, 79 deletions

diff --git a/ChangeLog b/ChangeLog
index fd9601e5ec..ad5d666aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/s390/bits/time.h: Removed.
+
 2000-11-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* iconvdata/TESTS: Add entries for IBM856, IBM930, IBM933, IBM935,
@@ -33,7 +37,7 @@
 	* sysdeps/unix/sysv/linux/s390/bits/time.h: Likewise.
 
 	* sysdeps/unix/sysv/linux/bits/socket.h (CMSG_ALIGN): Cast result
-	of unary ~ to size_t.Update.
+	of unary ~ to size_t.
 
 	* stdlib/strtod.c: Make gcc shut up about SWAP use.
 
@@ -163,8 +167,8 @@
 	(locale_ctype_t): Remove translit_copy_locale, translit_copy_repertoire
 	fields, add translit_include field.
 	(ctype_read): After seeing "translit_start" in ignore_content mode,
-	skip the entire translit section, not only one line. Remove dead test
-	for tok_translit_end. Enqueue include statements into a list.
+	skip the entire translit section, not only one line.  Remove dead test
+	for tok_translit_end.  Enqueue include statements into a list.
 	Signal error if tok_eof seen before tok_translit_end.
 	(translit_flatten): New function.
 	(allocate_arrays): Call translit_flatten.
@@ -181,7 +185,7 @@
 	* intl/dcigettext.c (guess_category_value): For libc always use
 	the setlocale() method.
 
-	* intl/Makefile: Add rules to build, run and, distribute  tst-gettext2.
+	* intl/Makefile: Add rules to build, run and, distribute tst-gettext2.
 	* intl/tst-gettext2.c: New file.
 	* intl/tst-gettext2.sh: New file.
 	* intl/tstlang1.po: New file.
diff --git a/sysdeps/unix/sysv/linux/s390/bits/time.h b/sysdeps/unix/sysv/linux/s390/bits/time.h
deleted file mode 100644
index 88fe006559..0000000000
--- a/sysdeps/unix/sysv/linux/s390/bits/time.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* System-dependent timing definitions.  Linux/S390 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/*
- * Never include this file directly; use <time.h> instead.
- */
-
-#ifndef __need_timeval
-# ifndef _BITS_TIME_H
-#  define _BITS_TIME_H	1
-
-/* ISO/IEC 9899:1990 7.12.1: <time.h>
-   The macro `CLOCKS_PER_SEC' is the number per second of the value
-   returned by the `clock' function. */
-/* CAE XSH, Issue 4, Version 2: <time.h>
-   The value of CLOCKS_PER_SEC is required to be 1 million on all
-   XSI-conformant systems. */
-#  define CLOCKS_PER_SEC  1000000l
-
-#  ifndef __STRICT_ANSI__
-/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
-   presents the real value for clock ticks per second for the system.  */
-#   include <bits/types.h>
-extern long int __sysconf (int);
-#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
-#  endif
-
-#  ifdef __USE_POSIX199309
-/* Identifier for system-wide realtime clock.  */
-#   define CLOCK_REALTIME		0
-/* Monotonic clock.  */
-#   define CLOCK_MONOTONIC		1
-/* High-resolution timer from the CPU.  */
-#   define CLOCK_PROCESS_CPUTIME_ID	2
-/* Thread-specific CPU-time clock.  */
-#   define CLOCK_THREAD_CPUTIME_ID	3
-
-/* Flag to indicate time is absolute.  */
-#   define TIMER_ABSTIME		1
-#  endif
-
-# endif	/* bits/time.h */
-#endif
-
-#ifdef __need_timeval
-# undef __need_timeval
-# ifndef _STRUCT_TIMEVAL
-#  define _STRUCT_TIMEVAL	1
-#  include <bits/types.h>
-
-/* A time value that is accurate to the nearest
-   microsecond but also has a range of years.  */
-struct timeval
-  {
-    __time_t tv_sec;		/* Seconds.  */
-    __suseconds_t tv_usec;	/* Microseconds.  */
-  };
-# endif	/* struct timeval */
-#endif	/* need timeval */