diff --git a/ChangeLog b/ChangeLog
index e2208dc704..836c7cd554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 1999-06-17  Ulrich Drepper  <drepper@cygnus.com>
 
+	* libio/libio.h (_IO_codecvt): Change __P ot __PMT.
+
 	* nss/getXXbyYY_r.c: Return error code not -1.
 	* nss/getXXent_r.c: Likewise.
-	* nss/getXXbyYY.c: Expect return alue to be ERANGE if buffer is too
+	* nss/getXXbyYY.c: Expect return value to be ERANGE if buffer is too
 	small.
 	* nscd/nscd_getgr_r.c: Return -1 in case nscd is not available and
 	value > 0 for error.
diff --git a/libio/libio.h b/libio/libio.h
index a3852886fc..ddf24b2456 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -201,26 +201,26 @@ enum __codecvt_result
    of the virtual functions in the libstdc++ codecvt class.  */
 struct _IO_codecvt
 {
-  void (*__codecvt_destr) __P ((struct _IO_codecvt *));
-  enum __codecvt_result (*__codecvt_do_out) __P ((struct _IO_codecvt *,
-						  __mbstate_t *,
-						  const wchar_t *,
-						  const wchar_t *,
-						  const wchar_t **, char *,
-						  char *, char **));
-  enum __codecvt_result (*__codecvt_do_unshift) __P ((struct _IO_codecvt *,
-						      __mbstate_t *, char *,
-						      char *, char **));
-  enum __codecvt_result (*__codecvt_do_in) __P ((struct _IO_codecvt *,
-						 __mbstate_t *,
-						 const char *, const char *,
-						 const char **, wchar_t *,
-						 wchar_t *, wchar_t **));
-  int (*__codecvt_do_encoding) __P ((struct _IO_codecvt *));
-  int (*__codecvt_do_always_noconv) __P ((struct _IO_codecvt *));
-  int (*__codecvt_do_length) __P ((struct _IO_codecvt *, __mbstate_t *,
-				   const char *, const char *, _IO_size_t));
-  int (*__codecvt_do_max_length) __P ((struct _IO_codecvt *));
+  void (*__codecvt_destr) __PMT ((struct _IO_codecvt *));
+  enum __codecvt_result (*__codecvt_do_out) __PMT ((struct _IO_codecvt *,
+						    __mbstate_t *,
+						    const wchar_t *,
+						    const wchar_t *,
+						    const wchar_t **, char *,
+						    char *, char **));
+  enum __codecvt_result (*__codecvt_do_unshift) __PMT ((struct _IO_codecvt *,
+							__mbstate_t *, char *,
+							char *, char **));
+  enum __codecvt_result (*__codecvt_do_in) __PMT ((struct _IO_codecvt *,
+						   __mbstate_t *,
+						   const char *, const char *,
+						   const char **, wchar_t *,
+						   wchar_t *, wchar_t **));
+  int (*__codecvt_do_encoding) __PMT ((struct _IO_codecvt *));
+  int (*__codecvt_do_always_noconv) __PMT ((struct _IO_codecvt *));
+  int (*__codecvt_do_length) __PMT ((struct _IO_codecvt *, __mbstate_t *,
+				     const char *, const char *, _IO_size_t));
+  int (*__codecvt_do_max_length) __PMT ((struct _IO_codecvt *));
 
   _IO_iconv_t __cd_in;
   _IO_iconv_t __cd_out;