Update.

2000-01-05  Andreas Schwab  <schwab@suse.de>

	* iconv/iconv_prog.c (process_block): Add cast to avoid warning.

	* locale/programs/linereader.c: Remove #include of stringtrans.h.

7 files changed, 21 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e61f141c9..ff5e6ef1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-05  Andreas Schwab  <schwab@suse.de>
+
+	* iconv/iconv_prog.c (process_block): Add cast to avoid warning.
+
 2000-01-05  Andreas Jaeger  <aj@suse.de>
 
 	* intl/locale.alias: Add lithunian entry.
@@ -7,6 +11,7 @@
 
 	* locale/programs/stringtrans.c: Removed.
 	* locale/programs/stringtrans.h: Removed.
+	* locale/programs/linereader.c: Remove #include of stringtrans.h.
 
 	* locale/findlocale.c (_nl_find_locale): Don't try using mmap is
 	_POSIX_MAPPED_FILES is not defined.
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 0144ac40ee..f56409c358 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -372,7 +372,7 @@ conversion stopped due to problem in writing the output"));
 	    {
 	    case EILSEQ:
 	      error (0, 0, _("illegal input sequence at position %ld"),
-		     addr - start);
+		     (long) (addr - start));
 	      break;
 	    case EINVAL:
 	      error (0, 0, _("\
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 5bfd37d403..b84ceb0cd6 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-05  Ulrich Drepper  <drepper@cygnus.com>
+
+	* internals.h (struct _pthread_descr_struct): Move new elements to
+	the end.
+
 2000-01-03  Kaz Kylheku  <kaz@ashi.footprints.net>
 
 	Redesigned how cancellation unblocks a thread from internal
diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 8af2fca335..a9e262b484 100644
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -117,7 +117,6 @@ struct _pthread_descr_struct {
   int p_priority;               /* Thread priority (== 0 if not realtime) */
   struct _pthread_fastlock * p_lock; /* Spinlock for synchronized accesses */
   int p_signal;                 /* last signal received */
-  struct pthread_atomic p_resume_count; /* number of times restart() was called on thread */
   sigjmp_buf * p_signal_jmp;    /* where to siglongjmp on a signal or NULL */
   sigjmp_buf * p_cancel_jmp;    /* where to siglongjmp on a cancel or NULL */
   char p_terminated;            /* true if terminated e.g. by pthread_exit */
@@ -130,8 +129,6 @@ struct _pthread_descr_struct {
   char p_cancelstate;           /* cancellation state */
   char p_canceltype;            /* cancellation type (deferred/async) */
   char p_canceled;              /* cancellation request pending */
-  char p_woken_by_cancel;       /* cancellation performed wakeup */
-  pthread_extricate_if *p_extricate; /* See above */
   int * p_errnop;               /* pointer to used errno variable */
   int p_errno;                  /* error returned by last system call */
   int * p_h_errnop;             /* pointer to used h_errno variable */
@@ -148,6 +145,10 @@ struct _pthread_descr_struct {
   int p_nr;                     /* Index of descriptor in __pthread_handles */
   int p_report_events;		/* Nonzero if events must be reported.  */
   td_eventbuf_t p_eventbuf;     /* Data for event.  */
+  struct pthread_atomic p_resume_count; /* number of times restart() was
+					   called on thread */
+  char p_woken_by_cancel;       /* cancellation performed wakeup */
+  pthread_extricate_if *p_extricate; /* See above */
   struct __res_state *p_resp;	/* Pointer to resolver state */
   struct __res_state p_res;	/* per-thread resolver state */
   /* New elements must be added at the end.  */
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index c689153bda..370f091fb8 100644
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -32,7 +32,6 @@
 #include "error.h"
 #include "linereader.h"
 #include "localedef.h"
-#include "stringtrans.h"
 
 
 /* Prototypes for local functions.  */
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0a6773c6cb..d78dd85f3c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-05  Ulrich Drepper  <drepper@cygnus.com>
+
+	* SUPPORTED: Change lv_LV entry to use ISO-8859-13.
+
 2000-01-03  Ulrich Drepper  <drepper@cygnus.com>
 
 	* SUPPORTED: Change lt_LT charset to ISO-8859-13.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 5ca1beb8ea..9741a92d62 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -39,7 +39,7 @@ it_IT ISO-8859-1
 iw_IL ISO-8859-8
 kl_GL ISO-8859-1
 lt_LT ISO-8859-13
-lv_LV BALTIC
+lv_LV ISO-8859-13
 nl_BE ISO-8859-1
 nl_NL ISO-8859-1
 no_NO ISO-8859-1