about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--argp/argp-help.c16
-rw-r--r--include/dirent.h1
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a7d3ad1fcb..04df14f6eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/dirent.h: Include <dirstream.h> first.
+
 2001-08-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* io/fts.c (fts_safe_changedir): Use __fxstat64 instead of __fstat.
diff --git a/argp/argp-help.c b/argp/argp-help.c
index de709dff8f..fccc8335b8 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1712,11 +1712,11 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
 	    {
 	      char *buf;
 
-	      asprintf (&buf, fmt, ap);
+	      __asprintf (&buf, fmt, ap);
 
-	      fwprintf (stream, L"%s: %s\n",
-			state ? state->name : program_invocation_short_name,
-			buf);
+	      __fwprintf (stream, L"%s: %s\n",
+			  state ? state->name : program_invocation_short_name,
+			  buf);
 
 	      free (buf);
 	    }
@@ -1787,9 +1787,9 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
 		{
 		  char *buf;
 
-		  asprintf (&buf, fmt, ap);
+		  __asprintf (&buf, fmt, ap);
 
-		  fwprintf (stream, L": %s", buf);
+		  __fwprintf (stream, L": %s", buf);
 
 		  free (buf);
 		}
@@ -1811,8 +1811,8 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
 
 #ifdef USE_IN_LIBIO
 	      if (_IO_fwide (stream, 0) > 0)
-		fwprintf (stream, ": %s",
-			  __strerror_r (errnum, buf, sizeof (buf)));
+		__fwprintf (stream, ": %s",
+			    __strerror_r (errnum, buf, sizeof (buf)));
 	      else
 #endif
 		{
diff --git a/include/dirent.h b/include/dirent.h
index d0ca3f2ffb..f09a88f21c 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,4 +1,5 @@
 #ifndef _DIRENT_H
+# include <dirstream.h>
 # include <dirent/dirent.h>
 
 /* Now define the internal interfaces.  */