about summary refs log tree commit diff
path: root/stdio
diff options
context:
space:
mode:
Diffstat (limited to 'stdio')
-rw-r--r--stdio/stdio.h10
-rw-r--r--stdio/vasprintf.c7
2 files changed, 8 insertions, 9 deletions
diff --git a/stdio/stdio.h b/stdio/stdio.h
index b2d064483b..7171c094e4 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -111,7 +111,7 @@ typedef __io_fileno_fn cookie_fileno_function_t;
 #endif
 
 /* Low level interface, independent of FILE representation.  */
-#if defined (__USE_GNU) && !defined (_LIBC)
+#if defined __USE_GNU && !defined _LIBC
 /* Define the user-visible type, with user-friendly member names.  */
 typedef struct
 {
@@ -340,7 +340,7 @@ extern int fcloseall __P ((void));
 extern FILE *fopen __P ((__const char *__filename, __const char *__modes));
 /* Open a file, replacing an existing stream with it. */
 extern FILE *freopen __P ((__const char *__restrict __filename,
-			   __const char *__rstrict __modes,
+			   __const char *__restrict __modes,
 			   FILE *__restrict __stream));
 
 /* Return a new, zeroed, stream.
@@ -554,7 +554,7 @@ putchar (int __c)
 #endif
 
 
-#if defined(__USE_SVID) || defined(__USE_MISC)
+#if defined __USE_SVID || defined __USE_MISC
 /* Get a word (int) from STREAM.  */
 extern int getw __P ((FILE *__stream));
 
@@ -663,8 +663,8 @@ extern int fileno __P ((FILE *__stream));
 #endif /* Use POSIX.  */
 
 
-#if (defined (__USE_POSIX2) || defined(__USE_SVID) || defined(__USE_BSD) || \
-     defined(__USE_MISC))
+#if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \
+     defined __USE_MISC)
 /* Create a new stream connected to a pipe running the given command.  */
 extern FILE *popen __P ((__const char *__command, __const char *__modes));
 
diff --git a/stdio/vasprintf.c b/stdio/vasprintf.c
index 57bacdbb17..47a074e6ca 100644
--- a/stdio/vasprintf.c
+++ b/stdio/vasprintf.c
@@ -56,10 +56,9 @@ enlarge_buffer (stream, c)
 /* Write formatted output from FORMAT to a string which is
    allocated with malloc and stored in *STRING_PTR.  */
 int
-vasprintf (string_ptr, format, args)
-     char **string_ptr;
-     const char *format;
-     va_list args;
+vasprintf (char **string_ptr,
+	   const char *format,
+	   va_list args)
 {
   FILE f;
   int done;