aboutsummaryrefslogtreecommitdiff
path: root/libio/iofwide.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-26 06:55:29 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-26 06:55:29 +0000
commit4e2e99997a2890df8ab5d7b86646a2b067eb8723 (patch)
tree30c16b2a54b2c166e03f136f4bd99a13db915032 /libio/iofwide.c
parentc36897fb5bef95d586557f960840ee0c614adabf (diff)
downloadglibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.tar
glibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.tar.gz
glibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.tar.bz2
glibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.zip
Update.
* libio/fileops.c (_IO_new_file_open): Recognize ,ccs= in mode string and load appropriate conversions. * libio/iofwide.c (__libio_codecvt): Renamed from libio_codecvt and made global. * libio/libioP.h: Declare __libio_codecvt. * manual/stdio.texi: Document ,ccs= option for fopen. * wcsmbs/wcsmbsload.c (__wcsmbs_named_conv): New function. * wcsmbs/wcsmbsload.h (__wcsmbs_named_conv): Declare. * libio/iofclose.c: Free conversion data if stream was wide-oriented. * sysdeps/unix/sysv/linux/i386/Dist: Add sys/io.h.
Diffstat (limited to 'libio/iofwide.c')
-rw-r--r--libio/iofwide.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/iofwide.c b/libio/iofwide.c
index 853920a001..04c8bba638 100644
--- a/libio/iofwide.c
+++ b/libio/iofwide.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -62,7 +62,7 @@ static int do_always_noconv (struct _IO_codecvt *codecvt);
/* The functions used in `codecvt' for libio are always the same. */
-static struct _IO_codecvt libio_codecvt =
+struct _IO_codecvt __libio_codecvt =
{
.__codecvt_destr = NULL, /* Destructor, never used. */
.__codecvt_do_out = do_out,
@@ -114,7 +114,7 @@ _IO_fwide (fp, mode)
__wcsmbs_clone_conv (&fcts);
/* The functions are always the same. */
- *cc = libio_codecvt;
+ *cc = __libio_codecvt;
cc->__cd_in.__cd.__nsteps = 1; /* Only one step allowed. */
cc->__cd_in.__cd.__steps = fcts.towc;