Index: ChangeLog
2005-02-02  Alexandre Oliva  <aoliva@redhat.com>

	* iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move declaration
	before use.  Fix typo in comment.

Index: nptl/ChangeLog
2005-02-02  Alexandre Oliva  <aoliva@redhat.com>

	* sysdeps/pthread/pthread.h (__sigsetjmp): Don't declare __env
	argument as array, GCC 4 doesn't like it.

Index: iconvdata/jis0208.h
--- iconvdata/jis0208.h	2003-06-11 18:40:42.000000000 -0300
+++ iconvdata/jis0208.h	2005-02-02 05:57:39.000000000 -0200
@@ -27,13 +27,7 @@
 /* Conversion table.  */
 extern const uint16_t __jis0208_to_ucs[];
 
-extern const char __jisx0208_from_ucs4_lat1[256][2];
-extern const char __jisx0208_from_ucs4_greek[0xc1][2];
-extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
-extern const char __jisx0208_from_ucs_tab[][2];
-
-
-/* Struct for table with indeces in UCS mapping table.  */
+/* Struct for table with indexes in UCS mapping table.  */
 struct jisx0208_ucs_idx
 {
   uint16_t start;
@@ -41,6 +35,11 @@
   uint16_t idx;
 };
 
+extern const char __jisx0208_from_ucs4_lat1[256][2];
+extern const char __jisx0208_from_ucs4_greek[0xc1][2];
+extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
+extern const char __jisx0208_from_ucs_tab[][2];
+
 
 static inline uint32_t
 __attribute ((always_inline))
Index: nptl/sysdeps/pthread/pthread.h
--- nptl/sysdeps/pthread/pthread.h	2004-12-05 00:18:43.000000000 -0200
+++ nptl/sysdeps/pthread/pthread.h	2005-02-02 08:21:16.000000000 -0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 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
@@ -661,7 +661,7 @@
 
 /* Function used in the macros.  */
 struct __jmp_buf_tag;
-extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __THROW;
+extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROW;
 
 
 /* Mutex handling.  */