@@ -96,10 +96,6 @@ static const char builtin_aliases[] =
#undef BUILTIN_ALIAS
};
-#include <libio/libioP.h>
-#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
-
-
/* Value of the GCONV_PATH environment variable. */
const char *__gconv_path_envvar;
@@ -213,6 +213,7 @@ libc_hidden_ldbl_proto (fprintf)
libc_hidden_ldbl_proto (vfprintf)
libc_hidden_ldbl_proto (sprintf)
libc_hidden_proto (ungetc)
+libc_hidden_proto (__getdelim)
libc_hidden_proto (fwrite)
libc_hidden_proto (perror)
libc_hidden_proto (remove)
@@ -37,7 +37,7 @@
null terminator), or -1 on error or EOF. */
ssize_t
-_IO_getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
+__getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
{
ssize_t result;
ssize_t cur_len = 0;
@@ -122,6 +122,5 @@ unlock_return:
_IO_release_lock (fp);
return result;
}
-
-weak_alias (_IO_getdelim, __getdelim)
-weak_alias (_IO_getdelim, getdelim)
+libc_hidden_def (__getdelim)
+weak_alias (__getdelim, getdelim)
@@ -734,7 +734,6 @@ libc_hidden_proto (_IO_getline)
extern size_t _IO_getline_info (FILE *,char *, size_t,
int, int, int *);
libc_hidden_proto (_IO_getline_info)
-extern ssize_t _IO_getdelim (char **, size_t *, int, FILE *);
extern size_t _IO_getwline (FILE *,wchar_t *, size_t, wint_t, int);
extern size_t _IO_getwline_info (FILE *,wchar_t *, size_t,
wint_t, int, wint_t *);
@@ -25,7 +25,7 @@
ssize_t
__getline (char **lineptr, size_t *n, FILE *stream)
{
- return _IO_getdelim (lineptr, n, '\n', stream);
+ return __getdelim (lineptr, n, '\n', stream);
}
weak_alias (__getline, getline)
@@ -55,7 +55,7 @@ __readonly_area (const char *ptr, size_t size)
while (! __feof_unlocked (fp))
{
- if (_IO_getdelim (&line, &linelen, '\n', fp) <= 0)
+ if (__getdelim (&line, &linelen, '\n', fp) <= 0)
break;
char *p;