summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/locales/zh_CN6
-rw-r--r--manual/stdio.texi7
4 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c5f3f8638b..cbef36a57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
2005-09-25 Ulrich Drepper <drepper@redhat.com>
+ [BZ #278]
+ * manual/stdio.texi (Hook Functions): Correct type of position
+ parameter of seeker and fix fallout of the change in the text.
+
[BZ #714]
* iconv/loop.c [!STORE_REST] (SINGLE): Correctly record number of
left-over bytes and store them correctly.
- * iconvdata/tst-iconv6.c: New file.
- * iconvdata/Makefile (tests): Add tst-iconv6.
+ * wcsmbs/tst-mbrtowc2.c: New file.
+ * wcsmbs/Makefile (tests): Add tst-mbrtowc2.
2005-09-24 Roland McGrath <roland@redhat.com>
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e1dd5edb72..1934f15632 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
2005-09-25 Ulrich Drepper <drepper@redhat.com>
+ [BZ #811]
+ * locales/zh_CN: Fix date_fmt information.
+
* SUPPORTED (SUPPORTED-LOCALES): Add km_KH.
[BZ #826]
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index 152411da10..89fcf3b819 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -128,9 +128,9 @@ am_pm "<U4E0A><U5348>";"<U4E0B><U5348>"
t_fmt_ampm "<U0025><U0070><U0020><U0025><U0049><U65F6><U0025><U004D><U5206><U0025><U0053><U79D2>"
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0059><U5E74><U0020><U0025><U006D><U6708><U0020>/
+<U0025><U0064><U65E5><U0020><U0025><U0041><U0020><U0025><U0048><U003A>/
+<U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
END LC_TIME
LC_MESSAGES
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 39fd4fb123..29de41a167 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -5067,14 +5067,11 @@ You should define the function to perform seek operations on the cookie
as:
@smallexample
-int @var{seeker} (void *@var{cookie}, fpos_t *@var{position}, int @var{whence})
+int @var{seeker} (void *@var{cookie}, off64_t *@var{position}, int @var{whence})
@end smallexample
For this function, the @var{position} and @var{whence} arguments are
-interpreted as for @code{fgetpos}; see @ref{Portable Positioning}. In
-the GNU library, @code{fpos_t} is equivalent to @code{off_t} or
-@code{long int}, and simply represents the number of bytes from the
-beginning of the file.
+interpreted as for @code{fgetpos}; see @ref{Portable Positioning}.
After doing the seek operation, your function should store the resulting
file position relative to the beginning of the file in @var{position}.