* libio/stdio.h: Declare open_wmemstream.

* libio/Versions: Export open_wmemstream for GLIBC_2.4.
git-mirror · Jan 16, 2006 · 63f8fe5 · 63f8fe5
1 parent 2d79a58
commit 63f8fe5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -775,6 +775,8 @@
 2006-01-11  Ulrich Drepper  <drepper@redhat.com>
 
 	* libio/wmemstream.c: New file.
+	* libio/stdio.h: Declare open_wmemstream.
+	* libio/Versions: Export open_wmemstream for GLIBC_2.4.
 	* libio/Makefile (routines): Add wmemstream.
 	(tests): Add tst-memstream1, tst-memstream2, tst-wmemstream2, and
 	tst-wmemstream2.

diff --git a/libio/Makefile b/libio/Makefile
@@ -35,7 +35,7 @@ routines	:=							      \
 	iofputws iofputws_u iogetwline iowpadn ioungetwc putwc putwc_u	      \
 	putwchar putwchar_u putchar putchar_u fwprintf swprintf vwprintf      \
 	wprintf wscanf fwscanf vwscanf vswprintf iovswscanf swscanf wgenops   \
-	wstrops wfileops iofwide fwide					      \
+	wstrops wfileops iofwide fwide wmemstream			      \
 									      \
 	clearerr feof ferror fileno fputc freopen fseek getc getchar	      \
 	memstream pclose putc putchar rewind setbuf setlinebuf vasprintf      \
@@ -54,7 +54,9 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
 	tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
 	tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
-	bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4
+	bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 \
+	tst-memstream1 tst-memstream2 \
+	tst-wmemstream1 tst-wmemstream2
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.

diff --git a/libio/Versions b/libio/Versions
@@ -145,6 +145,9 @@ libc {
     # w*
     wprintf; wscanf;
   }
+  GLIBC_2.4 {
+    open_wmemstream;
+  }
   GLIBC_PRIVATE {
     # Used by NPTL and librt
     __libc_fatal;

diff --git a/libio/stdio.h b/libio/stdio.h
@@ -293,6 +293,11 @@ extern FILE *fmemopen (void *__s, size_t __len, __const char *__modes) __THROW;
    and the number of characters written on fflush or fclose.  */
 extern FILE *open_memstream (char **__restrict __bufloc,
 			     size_t *__restrict __sizeloc) __THROW;
+
+/* Like OPEN_MEMSTREAM, but the stream is wide oriented and produces
+   a wide character string.  */
+extern FILE *open_wmemstream (wchar_t **__restrict __bufloc,
+			      size_t *__restrict __sizeloc) __THROW;
 #endif