summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-02-08 09:04:28 +0000
committerUlrich Drepper <drepper@redhat.com>2005-02-08 09:04:28 +0000
commit4bae262d2a83847c7e6e6df5989554d51ba8241f (patch)
tree4e3d7926192287bf6ba1fd5b2d2b311d35000365
parent606832e6e59fc9771c1c9b2de8666bdfb0b344de (diff)
* iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move before use.cvs/fedora-glibc-20050208T0948
-rw-r--r--ChangeLog4
-rw-r--r--iconvdata/jis0208.h20
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/pthread/pthread.h4
4 files changed, 21 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 14f2f1b303..6a6b672a41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-07 Richard Henderson <rth@redhat.com>
+
+ * iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move before use.
+
2005-02-08 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/dl-machine.h (elf_machine_rela): Remove code using
diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h
index 9dea38973c..8255bafc62 100644
--- a/iconvdata/jis0208.h
+++ b/iconvdata/jis0208.h
@@ -1,5 +1,5 @@
/* Access functions for JISX0208 conversion.
- Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2000,2003,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -24,15 +24,6 @@
#include <gconv.h>
#include <stdint.h>
-/* 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 jisx0208_ucs_idx
{
@@ -42,6 +33,15 @@ struct jisx0208_ucs_idx
};
+/* 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];
+
+
static inline uint32_t
__attribute ((always_inline))
jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5ba1a14cbb..7d916791d7 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-07 Richard Henderson <rth@redhat.com>
+
+ * sysdeps/pthread/pthread.h (__sigsetjmp): Use pointer as first
+ argument.
+
2004-11-03 Marcus Brinkmann <marcus@gnu.org>
* sysdeps/generic/lowlevellock.h (__generic_mutex_unlock): Fix
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 5046a6976b..57024e1e84 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -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 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
/* 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. */