diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libio/stdio.h | 8 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index beb014377b..9358c445c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-27 Ulrich Drepper <drepper@redhat.com> + + * libio/stdio.h: Move open_wmemstream prototype to ... + * wcsmbs/wchar.h: ... here. + 2006-09-25 Jakub Jelinek <jakub@redhat.com> [BZ #3252] diff --git a/libio/stdio.h b/libio/stdio.h index 566ec5a9bf..5e74305638 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -291,13 +291,7 @@ extern FILE *fmemopen (void *__s, size_t __len, __const char *__modes) __THROW; /* Open a stream that writes into a malloc'd buffer that is expanded as necessary. *BUFLOC and *SIZELOC are updated with the buffer's location 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; +extern FILE *open_memstream (char **__bufloc, size_t *__sizeloc) __THROW; #endif diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 5dc7e19345..f54abfaa96 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -600,6 +600,13 @@ extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n) /* Wide character I/O functions. */ + +#ifdef __USE_GNU +/* Like OPEN_MEMSTREAM, but the stream is wide oriented and produces + a wide character string. */ +extern __FILE *open_wmemstream (wchar_t **__bufloc, size_t *__sizeloc) __THROW; +#endif + #if defined __USE_ISOC99 || defined __USE_UNIX98 __BEGIN_NAMESPACE_C99 |