diff --git a/ChangeLog b/ChangeLog
index 3cd2163492..7cf98e1d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1998-10-05  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/unix/sysv/linux/bits/socket.h (__cmsg_nxthdr): Use __P
+	in definitions of inline stat functions so that they match the
+	declaration.
+	* stdlib/stdlib.h: Likewise.
+	* wcsmbs/wchar.h: Likewise.
+	* libio/stdio.h: Likewise.
+	* stdio/stdio.h: Likewise.
+	* sysdeps/wordsize-64/inttypes.h: Likewise.
+	* sysdeps/wordsize-32/inttypes.h: Likewise.
+	* string/argz.h: Likewise.
+	* argp/argp.h: Likewise.
+
 1998-10-06  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/bits/in.h: Remove ipv6_mreq which is in
diff --git a/argp/argp.h b/argp/argp.h
index 8045e3b456..b4ac686393 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -535,13 +535,13 @@ extern void *__argp_input __P ((__const struct argp *argp,
 # endif
 
 ARGP_EI void
-__argp_usage (__const struct argp_state *__state)
+__argp_usage __P ((__const struct argp_state *__state))
 {
   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
 }
 
 ARGP_EI int
-__option_is_short (__const struct argp_option *__opt)
+__option_is_short __P ((__const struct argp_option *__opt))
 {
   if (__opt->flags & OPTION_DOC)
     return 0;
@@ -553,7 +553,7 @@ __option_is_short (__const struct argp_option *__opt)
 }
 
 ARGP_EI int
-__option_is_end (__const struct argp_option *__opt)
+__option_is_end __P ((__const struct argp_option *__opt))
 {
   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
 }
diff --git a/libio/stdio.h b/libio/stdio.h
index c800300dce..f7677390e5 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -281,7 +281,7 @@ extern int vsprintf __P ((char *__restrict __s,
 
 #ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-vprintf (__const char *__restrict __fmt, _G_va_list __arg)
+vprintf __P ((__const char *__restrict __fmt, _G_va_list __arg))
 {
   return vfprintf (stdout, __fmt, __arg);
 }
@@ -366,7 +366,7 @@ extern int getchar __P ((void));
 
 #ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-getchar (void)
+getchar __P ((void))
 {
   return _IO_getc (stdin);
 }
@@ -379,13 +379,13 @@ extern int getchar_unlocked __P ((void));
 
 # ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-getc_unlocked (FILE *__fp)
+getc_unlocked __P ((FILE *__fp))
 {
   return _IO_getc_unlocked (__fp);
 }
 
 __STDIO_INLINE int
-getchar_unlocked (void)
+getchar_unlocked __P ((void))
 {
   return _IO_getc_unlocked (stdin);
 }
@@ -406,7 +406,7 @@ extern int putchar __P ((int __c));
 
 #ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-putchar (int __c)
+putchar __P ((int __c))
 {
   return _IO_putc (__c, stdout);
 }
@@ -418,7 +418,7 @@ extern int fputc_unlocked __P ((int __c, FILE *__stream));
 
 # ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-fputc_unlocked (int __c, FILE *__stream)
+fputc_unlocked __P ((int __c, FILE *__stream))
 {
   return _IO_putc_unlocked (__c, __stream);
 }
@@ -432,13 +432,13 @@ extern int putchar_unlocked __P ((int __c));
 
 # ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-putc_unlocked (int __c, FILE *__stream)
+putc_unlocked __P ((int __c, FILE *__stream))
 {
   return _IO_putc_unlocked (__c, __stream);
 }
 
 __STDIO_INLINE int
-putchar_unlocked (int __c)
+putchar_unlocked __P ((int __c))
 {
   return _IO_putc_unlocked (__c, stdout);
 }
@@ -487,7 +487,7 @@ extern _IO_ssize_t getline __P ((char **__lineptr, size_t *__n,
 
 # ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE _IO_ssize_t
-getline (char **__lineptr, size_t *__n, FILE *__stream)
+getline __P ((char **__lineptr, size_t *__n, FILE *__stream))
 {
   return __getdelim (__lineptr, __n, '\n', __stream);
 }
@@ -618,13 +618,13 @@ extern int ferror_unlocked __P ((FILE *__stream));
 
 # ifdef __USE_EXTERN_INLINES
 __STDIO_INLINE int
-feof_unlocked (FILE *__stream)
+feof_unlocked __P ((FILE *__stream))
 {
   return _IO_feof_unlocked (__stream);
 }
 
 __STDIO_INLINE int
-ferror_unlocked (FILE *__stream)
+ferror_unlocked __P ((FILE *__stream))
 {
   return _IO_ferror_unlocked (__stream);
 }
diff --git a/stdio/stdio.h b/stdio/stdio.h
index c2d2060e33..513b079c47 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -426,7 +426,7 @@ extern int vsprintf __P ((char *__restrict __s,
 
 #ifdef	__OPTIMIZE__
 extern __inline int
-vprintf (const char *__restrict __fmt, __gnuc_va_list __arg)
+vprintf __P ((const char *__restrict __fmt, __gnuc_va_list __arg))
 {
   return vfprintf (stdout, __fmt, __arg);
 }
@@ -500,17 +500,17 @@ extern int vsscanf __P ((__const char *__s, __const char *__format,
 
 #ifdef	__OPTIMIZE__
 extern __inline int
-vfscanf (FILE *__s, const char *__fmt, __gnuc_va_list __arg)
+vfscanf __P ((FILE *__s, const char *__fmt, __gnuc_va_list __arg))
 {
   return __vfscanf (__s, __fmt, __arg);
 }
 extern __inline int
-vscanf (const char *__fmt, __gnuc_va_list __arg)
+vscanf __P ((const char *__fmt, __gnuc_va_list __arg))
 {
   return __vfscanf (stdin, __fmt, __arg);
 }
 extern __inline int
-vsscanf (const char *__s, const char *__fmt, __gnuc_va_list __arg)
+vsscanf __P ((const char *__s, const char *__fmt, __gnuc_va_list __arg))
 {
   return __vsscanf (__s, __fmt, __arg);
 }
@@ -542,7 +542,7 @@ extern int getchar __P ((void));
 
 #ifdef	__OPTIMIZE__
 extern __inline int
-getchar (void)
+getchar __P ((void))
 {
   return __getc (stdin);
 }
@@ -555,13 +555,13 @@ extern int getchar_unlocked __P ((void));
 
 # ifdef __OPTIMIZE__
 extern __inline int
-getc_unlocked (FILE *__stream)
+getc_unlocked __P ((FILE *__stream))
 {
   return __getc (__stream);
 }
 
 extern __inline int
-getchar_unlocked (void)
+getchar_unlocked __P ((void))
 {
   return __getc (stdin);
 }
@@ -590,7 +590,7 @@ extern int putchar __P ((int __c));
 
 #ifdef __OPTIMIZE__
 extern __inline int
-putchar (int __c)
+putchar __P ((int __c))
 {
   return __putc (__c, stdout);
 }
@@ -602,7 +602,7 @@ extern int fputc_unlocked __P ((int __c, FILE *__stream));
 
 # ifdef __OPTIMIZE__
 extern __inline int
-fputc_unlocked (int __c, FILE *__stream)
+fputc_unlocked __P ((int __c, FILE *__stream))
 {
   return __putc (__c, __stream);
 }
@@ -616,13 +616,13 @@ extern int putchar_unlocked __P ((int __c));
 
 # ifdef __OPTIMIZE__
 extern __inline int
-putc_unlocked (int __c, FILE *__stream)
+putc_unlocked __P ((int __c, FILE *__stream))
 {
   return __putc (__c, __stream);
 }
 
 extern __inline int
-putchar_unlocked (int __c)
+putchar_unlocked __P ((int __c))
 {
   return __putc (__c, stdout);
 }
@@ -673,7 +673,7 @@ ssize_t getline __P ((char **__lineptr, size_t *__n, FILE *__stream));
 
 #ifdef	__OPTIMIZE__
 extern __inline ssize_t
-getline (char **__lineptr, size_t *__n, FILE *__stream)
+getline __P ((char **__lineptr, size_t *__n, FILE *__stream))
 {
   return __getdelim (__lineptr, __n, '\n', __stream);
 }
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 72a91af894..7eb34fdf15 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -236,31 +236,31 @@ extern unsigned long long int __strtoull_internal __P ((__const char *
 /* Define inline functions which call the internal entry points.  */
 
 extern __inline double
-strtod (__const char *__restrict __nptr, char **__restrict __endptr)
+strtod __P ((__const char *__restrict __nptr, char **__restrict __endptr))
 {
   return __strtod_internal (__nptr, __endptr, 0);
 }
 extern __inline long int
-strtol (__const char *__restrict __nptr, char **__restrict __endptr,
-	int __base)
+strtol __P ((__const char *__restrict __nptr, char **__restrict __endptr,
+	     int __base))
 {
   return __strtol_internal (__nptr, __endptr, __base, 0);
 }
 extern __inline unsigned long int
-strtoul (__const char *__restrict __nptr, char **__restrict __endptr,
-	 int __base)
+strtoul __P ((__const char *__restrict __nptr, char **__restrict __endptr,
+	      int __base))
 {
   return __strtoul_internal (__nptr, __endptr, __base, 0);
 }
 
 # ifdef __USE_ISOC9X
 extern __inline float
-strtof (__const char *__restrict __nptr, char **__restrict __endptr)
+strtof __P ((__const char *__restrict __nptr, char **__restrict __endptr))
 {
   return __strtof_internal (__nptr, __endptr, 0);
 }
 extern __inline __long_double_t
-strtold (__const char *__restrict __nptr, char **__restrict __endptr)
+strtold __P ((__const char *__restrict __nptr, char **__restrict __endptr))
 {
   return __strtold_internal (__nptr, __endptr, 0);
 }
@@ -268,14 +268,14 @@ strtold (__const char *__restrict __nptr, char **__restrict __endptr)
 
 # ifdef __USE_BSD
 __extension__ extern __inline long long int
-strtoq (__const char *__restrict __nptr, char **__restrict __endptr,
-	int __base)
+strtoq __P ((__const char *__restrict __nptr, char **__restrict __endptr,
+	     int __base))
 {
   return __strtoll_internal (__nptr, __endptr, __base, 0);
 }
 __extension__ extern __inline unsigned long long int
-strtouq (__const char *__restrict __nptr, char **__restrict __endptr,
-	 int __base)
+strtouq __P ((__const char *__restrict __nptr, char **__restrict __endptr,
+	      int __base))
 {
   return __strtoull_internal (__nptr, __endptr, __base, 0);
 }
@@ -283,38 +283,38 @@ strtouq (__const char *__restrict __nptr, char **__restrict __endptr,
 
 # if defined __USE_MISC || defined __USE_ISOC9X
 __extension__ extern __inline long long int
-strtoll (__const char *__restrict __nptr, char **__restrict __endptr,
-	 int __base)
+strtoll __P ((__const char *__restrict __nptr, char **__restrict __endptr,
+	      int __base))
 {
   return __strtoll_internal (__nptr, __endptr, __base, 0);
 }
 __extension__ extern __inline unsigned long long int
-strtoull (__const char * __restrict __nptr, char **__restrict __endptr,
-	  int __base)
+strtoull __P ((__const char * __restrict __nptr, char **__restrict __endptr,
+	       int __base))
 {
   return __strtoull_internal (__nptr, __endptr, __base, 0);
 }
 # endif
 
 extern __inline double
-atof (__const char *__nptr)
+atof __P ((__const char *__nptr))
 {
   return strtod (__nptr, (char **) NULL);
 }
 extern __inline int
-atoi (__const char *__nptr)
+atoi __P ((__const char *__nptr))
 {
   return (int) strtol (__nptr, (char **) NULL, 10);
 }
 extern __inline long int
-atol (__const char *__nptr)
+atol __P ((__const char *__nptr))
 {
   return strtol (__nptr, (char **) NULL, 10);
 }
 
 # if defined __USE_MISC || defined __USE_ISOC9X
 __extension__ extern __inline long long int
-atoll (__const char *__nptr)
+atoll __P ((__const char *__nptr))
 {
   return strtoll (__nptr, (char **) NULL, 10);
 }
diff --git a/string/argz.h b/string/argz.h
index cdd9c50400..430726914d 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -137,7 +137,7 @@ extern char *argz_next __P ((__const char *argz, size_t __argz_len,
 
 #ifdef __USE_EXTERN_INLINES
 extern inline char *
-__argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)
+__argz_next __P ((__const char *__argz, size_t __argz_len, __const char *__entry))
 {
   if (__entry)
     {
@@ -150,7 +150,7 @@ __argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)
     return __argz_len > 0 ? (char *) __argz : 0;
 }
 extern inline char *
-argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)
+argz_next __P ((__const char *__argz, size_t __argz_len, __const char *__entry))
 {
   return __argz_next (__argz, __argz_len, __entry);
 }
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index e5f4259433..eef389db44 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -200,7 +200,7 @@ struct cmsghdr
 extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
 					   struct cmsghdr *__cmsg));
 _EXTERN_INLINE struct cmsghdr *
-__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)
+__cmsg_nxthdr __P ((struct msghdr *__mhdr, struct cmsghdr *__cmsg))
 {
   if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
     /* The kernel header does this so there may be a reason.  */
diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h
index 6144411e24..48c97b3396 100644
--- a/sysdeps/wordsize-32/inttypes.h
+++ b/sysdeps/wordsize-32/inttypes.h
@@ -278,7 +278,8 @@ extern long long int __strtoll_internal __P ((__const char *__restrict __nptr,
 #  define __strtoll_internal_defined	1
 # endif
 extern __inline intmax_t
-strtoimax (__const char *__restrict nptr, char **__restrict endptr, int base)
+strtoimax __P ((__const char *__restrict nptr, char **__restrict endptr,
+		int base))
 {
   return __strtoll_internal (nptr, endptr, base, 0);
 }
@@ -295,7 +296,8 @@ extern unsigned long long int __strtoull_internal __P ((__const char *
 #  define __strtoull_internal_defined	1
 # endif
 extern __inline uintmax_t
-strtoumax (__const char *__restrict nptr, char **__restrict endptr, int base)
+strtoumax __P ((__const char *__restrict nptr, char **__restrict endptr,
+		int base))
 {
   return __strtoull_internal (nptr, endptr, base, 0);
 }
@@ -310,8 +312,8 @@ extern long long int __wcstoll_internal __P ((__const wchar_t *
 #  define __wcstoll_internal_defined	1
 # endif
 extern __inline intmax_t
-wcstoimax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
-	   int base)
+wcstoimax __P ((__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+		int base))
 {
   return __wcstoll_internal (nptr, endptr, base, 0);
 }
@@ -329,8 +331,8 @@ extern unsigned long long int __wcstoull_internal __P ((__const wchar_t *
 #  define __wcstoull_internal_defined	1
 # endif
 extern __inline uintmax_t
-wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
-	   int base)
+wcstoumax __P ((__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+		int base))
 {
   return __wcstoull_internal (nptr, endptr, base, 0);
 }
diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h
index 61730bbc00..48a7c8fd92 100644
--- a/sysdeps/wordsize-64/inttypes.h
+++ b/sysdeps/wordsize-64/inttypes.h
@@ -277,7 +277,8 @@ extern long int __strtol_internal __P ((__const char *__restrict __nptr,
 #  define __strtol_internal_defined	1
 # endif
 extern __inline intmax_t
-strtoimax (__const char *__restrict nptr, char **__restrict endptr, int base)
+strtoimax __P ((__const char *__restrict nptr, char **__restrict endptr,
+		int base))
 {
   return __strtol_internal (nptr, endptr, base, 0);
 }
@@ -291,7 +292,8 @@ extern unsigned long int __strtoul_internal __P ((__const char *
 #  define __strtoul_internal_defined	1
 # endif
 extern __inline uintmax_t
-strtoumax (__const char *__restrict nptr, char **__restrict endptr, int base)
+strtoumax __P ((__const char *__restrict nptr, char **__restrict endptr,
+		int base))
 {
   return __strtoul_internal (nptr, endptr, base, 0);
 }
@@ -304,8 +306,8 @@ extern long int __wcstol_internal __P ((__const wchar_t * __restrict __nptr,
 #  define __wcstol_internal_defined	1
 # endif
 extern __inline intmax_t
-wcstoimax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
-	   int base)
+wcstoimax __P ((__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+		int base))
 {
   return __wcstol_internal (nptr, endptr, base, 0);
 }
@@ -321,8 +323,8 @@ extern unsigned long int __wcstoul_internal __P ((__const wchar_t *
 #  define __wcstoul_internal_defined	1
 # endif
 extern __inline uintmax_t
-wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
-	   int base)
+wcstoumax __P ((__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+		int base))
 {
   return __wcstoul_internal (nptr, endptr, base, 0);
 }
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 14da7a1913..570d4a6ce1 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -236,8 +236,8 @@ extern size_t mbrlen __P ((__const char *__restrict __s, size_t __n,
 #if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
     && defined __USE_EXTERN_INLINES
 /* Define inline function as optimization.  */
-extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n,
-			       mbstate_t *__restrict __ps)
+extern __inline size_t mbrlen __P ((__const char *__restrict __s, size_t __n,
+				    mbstate_t *__restrict __ps))
 { return (__ps != NULL
 	  ? mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); }
 #endif
@@ -440,36 +440,40 @@ extern unsigned long long int __wcstoull_internal __P ((__const wchar_t *
 #if defined __OPTIMIZE__ && __GNUC__ >= 2
 /* Define inline functions which call the internal entry points.  */
 
-extern __inline double wcstod (__const wchar_t *__restrict __nptr,
-			       wchar_t **__restrict __endptr)
+extern __inline double wcstod __P ((__const wchar_t *__restrict __nptr,
+				    wchar_t **__restrict __endptr))
 { return __wcstod_internal (__nptr, __endptr, 0); }
-extern __inline long int wcstol (__const wchar_t *__restrict __nptr,
-                                 wchar_t **__restrict __endptr, int __base)
+extern __inline long int wcstol __P ((__const wchar_t *__restrict __nptr,
+				      wchar_t **__restrict __endptr,
+				      int __base))
 { return __wcstol_internal (__nptr, __endptr, __base, 0); }
-extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr,
-                                           wchar_t **__restrict __endptr,
-					   int __base)
+extern __inline unsigned long int wcstoul __P ((__const wchar_t *
+						__restrict __nptr,
+						wchar_t **__restrict __endptr,
+						int __base))
 { return __wcstoul_internal (__nptr, __endptr, __base, 0); }
 
 # ifdef __USE_GNU
-extern __inline float wcstof (__const wchar_t *__restrict __nptr,
-			      wchar_t **__restrict __endptr)
+extern __inline float wcstof __P ((__const wchar_t *__restrict __nptr,
+				   wchar_t **__restrict __endptr))
 { return __wcstof_internal (__nptr, __endptr, 0); }
-extern __inline __long_double_t wcstold (__const wchar_t *__restrict __nptr,
-					 wchar_t **__restrict __endptr)
+extern __inline __long_double_t wcstold __P ((__const wchar_t *
+					      __restrict __nptr,
+					      wchar_t **__restrict __endptr))
 { return __wcstold_internal (__nptr, __endptr, 0); }
 
 
 __extension__
-extern __inline long long int wcstoq (__const wchar_t *__restrict __nptr,
-				      wchar_t **__restrict __endptr,
-				      int __base)
+extern __inline long long int wcstoq __P ((__const wchar_t *__restrict __nptr,
+					   wchar_t **__restrict __endptr,
+					   int __base))
 { return __wcstoll_internal (__nptr, __endptr, __base, 0); }
 __extension__
-extern __inline unsigned long long int wcstouq (__const wchar_t *
-						__restrict __nptr,
-						wchar_t **__restrict __endptr,
-						int __base)
+extern __inline unsigned long long int wcstouq __P ((__const wchar_t *
+						     __restrict __nptr,
+						     wchar_t **
+						     __restrict __endptr,
+						     int __base))
 { return __wcstoull_internal (__nptr, __endptr, __base, 0); }
 # endif /* Use GNU.  */
 #endif /* Optimizing GCC >=2.  */