DragonFly BSD
DragonFly submit List (threaded) for 2003-11
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Heres two patches


From: Craig Dooley <craig@xxxxxxxxxx>
Date: Wed, 12 Nov 2003 13:08:19 -0500

The first removes all __P() from src/lib, and the second is my cumulative 
patch to get the kernel compiling with gcc 3.3.2.  Currently buildkernel 
doesnt work, nor does config; make depend;  They both die in aicasm with

===> dev/disk/aic7xxx/aicasm
rm -f .depend
mkdep -f .depend -a   -nostdinc -I/usr/include -I.  /usr/src/sys/dev/disk/
aic7xxx/aicasm/aicasm.c /usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_symbol.c 
aicasm_gram.c aicasm_macro_gram.c aicasm_scan.c aicasm_macro_scan.c
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_gram.y:62:20: aicasm.h: No such 
file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_gram.y:63:27: aicasm_symbol.h: No 
such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_gram.y:64:30: aicasm_insformat.h: 
No such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_gram.y:62:20: aicasm.h: No 
such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_gram.y:63:27: 
aicasm_symbol.h: No such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_gram.y:64:30: 
aicasm_insformat.h: No such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_scan.l:61:20: aicasm.h: No such 
file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_scan.l:62:27: aicasm_symbol.h: No 
such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_scan.l:61:20: aicasm.h: No 
such file or directory
/usr/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_scan.l:62:27: 
aicasm_symbol.h: No such file or directory
mkdep: compile failed
*** Error code 1

I'm assuming this might have something to do with gcc's include paths?  I will 
look into it more when I get home tonight. I have not tested this with gcc 
3.3.3 from ports since that currently will not build

. /xgcc -B./ -B/usr/local/i386-portbld-freebsd4.8/bin/ -isystem /usr/local/
i386-portbld-freebsd4.8/include -isystem /usr/local/i386-portbld-freebsd4.8/
sys-include -O2 -DIN_GCC    -W -Wall -Wwrite-strings -Wstrict-prototypes 
-Wmissing-prototypes -isystem ./include  -I. -I. -I.././..//gcc-3.3-20031103/
gcc -I.././..//gcc-3.3-20031103/gcc/. -I.././..//gcc-3.3-20031103/gcc/config 
-I.././..//gcc-3.3-20031103/gcc/../include  -g0 -finhibit-size-directive 
-fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss  \
   -c .././..//gcc-3.3-20031103/gcc/crtstuff.c -DCRT_BEGIN \
  -o crtbegin.o
In file included from /usr/include/sys/stdint.h:11,
                 from include/stdio.h:55,
                 from ../../gcc-3.3-20031103/gcc/tsystem.h:72,
                 from ../../gcc-3.3-20031103/gcc/crtstuff.c:62:
/usr/include/machine/stdint.h:77: error: conflicting types for `__mbstate_t'
include/machine/ansi.h:157: error: previous declaration of `__mbstate_t'
In file included from ../../gcc-3.3-20031103/gcc/tsystem.h:96,
                 from ../../gcc-3.3-20031103/gcc/crtstuff.c:62:
/usr/include/time.h:130: error: parse error before ',' token

-- 
------------------------------------------------------------------------
Craig Dooley						craig@xxxxxxxxxx
------------------------------------------------------------------------
Index: lib/libatm/libatm.h
===================================================================
RCS file: /home/dcvs/src/lib/libatm/libatm.h,v
retrieving revision 1.2
diff -u -r1.2 libatm.h
--- lib/libatm/libatm.h	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libatm/libatm.h	12 Nov 2003 17:29:40 -0000
@@ -82,39 +82,39 @@
  */
 
 /* atm_addr.c */
-extern int		get_hex_atm_addr __P((char *, u_char *, int));
-extern char		*format_atm_addr __P((Atm_addr *));
+extern int		get_hex_atm_addr (char *, u_char *, int);
+extern char		*format_atm_addr (Atm_addr *);
 
 /* cache_key.c */
-extern void		scsp_cache_key __P((Atm_addr *,
-				struct in_addr  *, int, char *));
+extern void		scsp_cache_key (Atm_addr *,
+				struct in_addr  *, int, char *);
 
 /* ioctl_subr.c */
-extern int		do_info_ioctl __P((struct atminfreq *, int));
-extern int		get_vcc_info __P((char *,
-				struct air_vcc_rsp **));
-extern int		get_subnet_mask __P((char *,
-				struct sockaddr_in *));
-extern int		get_mtu __P((char *));
-extern int		verify_nif_name __P((char *));
-extern int		get_cfg_info __P((char *, struct air_cfg_rsp **));
-extern int		get_intf_info __P((char *, struct air_int_rsp **));
-extern int		get_netif_info __P((char *, struct air_netif_rsp **));
+extern int		do_info_ioctl (struct atminfreq *, int);
+extern int		get_vcc_info (char *,
+				struct air_vcc_rsp **);
+extern int		get_subnet_mask (char *,
+				struct sockaddr_in *);
+extern int		get_mtu (char *);
+extern int		verify_nif_name (char *);
+extern int		get_cfg_info (char *, struct air_cfg_rsp **);
+extern int		get_intf_info (char *, struct air_int_rsp **);
+extern int		get_netif_info (char *, struct air_netif_rsp **);
 
 /* ip_addr.c */
-extern struct sockaddr_in	*get_ip_addr __P((char *));
-extern char		*format_ip_addr __P((struct in_addr *));
+extern struct sockaddr_in	*get_ip_addr (char *);
+extern char		*format_ip_addr (struct in_addr *);
 
 /* ip_checksum.c */
-extern short		ip_checksum __P((char *, int));
+extern short		ip_checksum (char *, int);
 
 /* timer.c */
 extern Harp_timer	*harp_timer_head;
 extern int		harp_timer_exec;
-extern void		timer_proc __P(());
-extern int		init_timer __P(());
-extern int		block_timer __P(());
-extern void		enable_timer __P((int));
+extern void		timer_proc ();
+extern int		init_timer ();
+extern int		block_timer ();
+extern void		enable_timer (int);
 
 
 #endif	/* _HARP_LIBHARP_H */
Index: lib/libc/db/btree/bt_close.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_close.c,v
retrieving revision 1.2
diff -u -r1.2 bt_close.c
--- lib/libc/db/btree/bt_close.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_close.c	12 Nov 2003 17:18:55 -0000
@@ -50,7 +50,7 @@
 #include <db.h>
 #include "btree.h"
 
-static int bt_meta __P((BTREE *));
+static int bt_meta (BTREE *);
 
 /*
  * BT_CLOSE -- Close a btree.
Index: lib/libc/db/btree/bt_conv.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_conv.c,v
retrieving revision 1.2
diff -u -r1.2 bt_conv.c
--- lib/libc/db/btree/bt_conv.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_conv.c	12 Nov 2003 17:18:55 -0000
@@ -43,7 +43,7 @@
 #include <db.h>
 #include "btree.h"
 
-static void mswap __P((PAGE *));
+static void mswap (PAGE *);
 
 /*
  * __BT_BPGIN, __BT_BPGOUT --
Index: lib/libc/db/btree/bt_delete.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_delete.c,v
retrieving revision 1.2
diff -u -r1.2 bt_delete.c
--- lib/libc/db/btree/bt_delete.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_delete.c	12 Nov 2003 17:18:55 -0000
@@ -45,11 +45,11 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_bdelete __P((BTREE *, const DBT *));
-static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int));
-static int __bt_pdelete __P((BTREE *, PAGE *));
-static int __bt_relink __P((BTREE *, PAGE *));
-static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+static int __bt_bdelete (BTREE *, const DBT *);
+static int __bt_curdel (BTREE *, const DBT *, PAGE *, u_int);
+static int __bt_pdelete (BTREE *, PAGE *);
+static int __bt_relink (BTREE *, PAGE *);
+static int __bt_stkacq (BTREE *, PAGE **, CURSOR *);
 
 /*
  * __bt_delete
Index: lib/libc/db/btree/bt_open.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_open.c,v
retrieving revision 1.2
diff -u -r1.2 bt_open.c
--- lib/libc/db/btree/bt_open.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_open.c	12 Nov 2003 17:18:55 -0000
@@ -67,9 +67,9 @@
 #define	MINPSIZE	128
 #endif
 
-static int byteorder __P((void));
-static int nroot __P((BTREE *));
-static int tmp __P((void));
+static int byteorder (void);
+static int nroot (BTREE *);
+static int tmp (void);
 
 /*
  * __BT_OPEN -- Open a btree.
Index: lib/libc/db/btree/bt_put.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_put.c,v
retrieving revision 1.2
diff -u -r1.2 bt_put.c
--- lib/libc/db/btree/bt_put.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_put.c	12 Nov 2003 17:18:55 -0000
@@ -46,7 +46,7 @@
 #include <db.h>
 #include "btree.h"
 
-static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+static EPG *bt_fast (BTREE *, const DBT *, const DBT *, int *);
 
 /*
  * __BT_PUT -- Add a btree item to the tree.
Index: lib/libc/db/btree/bt_search.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_search.c,v
retrieving revision 1.2
diff -u -r1.2 bt_search.c
--- lib/libc/db/btree/bt_search.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_search.c	12 Nov 2003 17:18:55 -0000
@@ -43,8 +43,8 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
-static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+static int __bt_snext (BTREE *, PAGE *, const DBT *, int *);
+static int __bt_sprev (BTREE *, PAGE *, const DBT *, int *);
 
 /*
  * __bt_search --
Index: lib/libc/db/btree/bt_seq.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_seq.c,v
retrieving revision 1.2
diff -u -r1.2 bt_seq.c
--- lib/libc/db/btree/bt_seq.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_seq.c	12 Nov 2003 17:18:55 -0000
@@ -46,9 +46,9 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
-static int __bt_seqadv __P((BTREE *, EPG *, int));
-static int __bt_seqset __P((BTREE *, EPG *, DBT *, int));
+static int __bt_first (BTREE *, const DBT *, EPG *, int *);
+static int __bt_seqadv (BTREE *, EPG *, int);
+static int __bt_seqset (BTREE *, EPG *, DBT *, int);
 
 /*
  * Sequential scan support.
Index: lib/libc/db/btree/bt_split.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/bt_split.c,v
retrieving revision 1.2
diff -u -r1.2 bt_split.c
--- lib/libc/db/btree/bt_split.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/btree/bt_split.c	12 Nov 2003 17:18:55 -0000
@@ -46,16 +46,16 @@
 #include <db.h>
 #include "btree.h"
 
-static int	 bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
+static int	 bt_broot (BTREE *, PAGE *, PAGE *, PAGE *);
 static PAGE	*bt_page
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_preserve __P((BTREE *, pgno_t));
+		    (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_preserve (BTREE *, pgno_t);
 static PAGE	*bt_psplit
-		    __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t));
+		    (BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
 static PAGE	*bt_root
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *));
-static recno_t	 rec_total __P((PAGE *));
+		    (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_rroot (BTREE *, PAGE *, PAGE *, PAGE *);
+static recno_t	 rec_total (PAGE *);
 
 #ifdef STATISTICS
 u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
Index: lib/libc/db/btree/btree.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/btree.h,v
retrieving revision 1.1
diff -u -r1.1 btree.h
--- lib/libc/db/btree/btree.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libc/db/btree/btree.h	12 Nov 2003 17:18:55 -0000
@@ -335,11 +335,11 @@
 	EPGNO	  bt_last;		/* last insert */
 
 					/* B: key comparison function */
-	int	(*bt_cmp) __P((const DBT *, const DBT *));
+	int	(*bt_cmp) (const DBT *, const DBT *);
 					/* B: prefix comparison function */
-	size_t	(*bt_pfx) __P((const DBT *, const DBT *));
+	size_t	(*bt_pfx) (const DBT *, const DBT *);
 					/* R: recno input function */
-	int	(*bt_irec) __P((struct _btree *, recno_t));
+	int	(*bt_irec) (struct _btree *, recno_t);
 
 	FILE	 *bt_rfp;		/* R: record FILE pointer */
 	int	  bt_rfd;		/* R: record file descriptor */
Index: lib/libc/db/btree/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/btree/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libc/db/btree/extern.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libc/db/btree/extern.h	12 Nov 2003 17:30:12 -0000
@@ -33,38 +33,38 @@
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
  */
 
-int	 __bt_close __P((DB *));
-int	 __bt_cmp __P((BTREE *, const DBT *, EPG *));
-int	 __bt_crsrdel __P((BTREE *, EPGNO *));
-int	 __bt_defcmp __P((const DBT *, const DBT *));
-size_t	 __bt_defpfx __P((const DBT *, const DBT *));
-int	 __bt_delete __P((const DB *, const DBT *, u_int));
-int	 __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int));
-int	 __bt_fd __P((const DB *));
-int	 __bt_free __P((BTREE *, PAGE *));
-int	 __bt_get __P((const DB *, const DBT *, DBT *, u_int));
-PAGE	*__bt_new __P((BTREE *, pgno_t *));
-void	 __bt_pgin __P((void *, pgno_t, void *));
-void	 __bt_pgout __P((void *, pgno_t, void *));
-int	 __bt_push __P((BTREE *, pgno_t, int));
-int	 __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int));
-EPG	*__bt_search __P((BTREE *, const DBT *, int *));
-int	 __bt_seq __P((const DB *, DBT *, DBT *, u_int));
-void	 __bt_setcur __P((BTREE *, pgno_t, u_int));
-int	 __bt_split __P((BTREE *, PAGE *,
-	    const DBT *, const DBT *, int, size_t, u_int32_t));
-int	 __bt_sync __P((const DB *, u_int));
+int	 __bt_close (DB *);
+int	 __bt_cmp (BTREE *, const DBT *, EPG *);
+int	 __bt_crsrdel (BTREE *, EPGNO *);
+int	 __bt_defcmp (const DBT *, const DBT *);
+size_t	 __bt_defpfx (const DBT *, const DBT *);
+int	 __bt_delete (const DB *, const DBT *, u_int);
+int	 __bt_dleaf (BTREE *, const DBT *, PAGE *, u_int);
+int	 __bt_fd (const DB *);
+int	 __bt_free (BTREE *, PAGE *);
+int	 __bt_get (const DB *, const DBT *, DBT *, u_int);
+PAGE	*__bt_new (BTREE *, pgno_t *);
+void	 __bt_pgin (void *, pgno_t, void *);
+void	 __bt_pgout (void *, pgno_t, void *);
+int	 __bt_push (BTREE *, pgno_t, int);
+int	 __bt_put (const DB *dbp, DBT *, const DBT *, u_int);
+int	 __bt_ret (BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
+EPG	*__bt_search (BTREE *, const DBT *, int *);
+int	 __bt_seq (const DB *, DBT *, DBT *, u_int);
+void	 __bt_setcur (BTREE *, pgno_t, u_int);
+int	 __bt_split (BTREE *, PAGE *,
+	    const DBT *, const DBT *, int, size_t, u_int32_t);
+int	 __bt_sync (const DB *, u_int);
 
-int	 __ovfl_delete __P((BTREE *, void *));
-int	 __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *));
-int	 __ovfl_put __P((BTREE *, const DBT *, pgno_t *));
+int	 __ovfl_delete (BTREE *, void *);
+int	 __ovfl_get (BTREE *, void *, size_t *, void **, size_t *);
+int	 __ovfl_put (BTREE *, const DBT *, pgno_t *);
 
 #ifdef DEBUG
-void	 __bt_dnpage __P((DB *, pgno_t));
-void	 __bt_dpage __P((PAGE *));
-void	 __bt_dump __P((DB *));
+void	 __bt_dnpage (DB *, pgno_t);
+void	 __bt_dpage (PAGE *);
+void	 __bt_dump (DB *);
 #endif
 #ifdef STATISTICS
-void	 __bt_stat __P((DB *));
+void	 __bt_stat (DB *);
 #endif
Index: lib/libc/db/hash/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libc/db/hash/extern.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libc/db/hash/extern.h	12 Nov 2003 17:30:28 -0000
@@ -33,32 +33,32 @@
  *	@(#)extern.h	8.4 (Berkeley) 6/16/94
  */
 
-BUFHEAD	*__add_ovflpage __P((HTAB *, BUFHEAD *));
-int	 __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_delete __P((HTAB *, BUFHEAD *));
-int	 __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int));
-int	 __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int));
-int	 __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, u_int32_t, SPLIT_RETURN *));
-int	 __buf_free __P((HTAB *, int, int));
-void	 __buf_init __P((HTAB *, int));
-u_int32_t	 __call_hash __P((HTAB *, char *, int));
-int	 __delpair __P((HTAB *, BUFHEAD *, int));
-int	 __expand_table __P((HTAB *));
-int	 __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int));
-u_int16_t	 __find_last_page __P((HTAB *, BUFHEAD **));
-void	 __free_ovflpage __P((HTAB *, BUFHEAD *));
-BUFHEAD	*__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int));
-int	 __get_page __P((HTAB *, char *, u_int32_t, int, int, int));
-int	 __ibitmap __P((HTAB *, int, int, int));
-u_int32_t	 __log2 __P((u_int32_t));
-int	 __put_page __P((HTAB *, char *, u_int32_t, int, int));
-void	 __reclaim_buf __P((HTAB *, BUFHEAD *));
-int	 __split_page __P((HTAB *, u_int32_t, u_int32_t));
+BUFHEAD	*__add_ovflpage (HTAB *, BUFHEAD *);
+int	 __addel (HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_delete (HTAB *, BUFHEAD *);
+int	 __big_insert (HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_keydata (HTAB *, BUFHEAD *, DBT *, DBT *, int);
+int	 __big_return (HTAB *, BUFHEAD *, int, DBT *, int);
+int	 __big_split (HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
+		int, u_int32_t, SPLIT_RETURN *);
+int	 __buf_free (HTAB *, int, int);
+void	 __buf_init (HTAB *, int);
+u_int32_t	 __call_hash (HTAB *, char *, int);
+int	 __delpair (HTAB *, BUFHEAD *, int);
+int	 __expand_table (HTAB *);
+int	 __find_bigpair (HTAB *, BUFHEAD *, int, char *, int);
+u_int16_t	 __find_last_page (HTAB *, BUFHEAD **);
+void	 __free_ovflpage (HTAB *, BUFHEAD *);
+BUFHEAD	*__get_buf (HTAB *, u_int32_t, BUFHEAD *, int);
+int	 __get_page (HTAB *, char *, u_int32_t, int, int, int);
+int	 __ibitmap (HTAB *, int, int, int);
+u_int32_t	 __log2 (u_int32_t);
+int	 __put_page (HTAB *, char *, u_int32_t, int, int);
+void	 __reclaim_buf (HTAB *, BUFHEAD *);
+int	 __split_page (HTAB *, u_int32_t, u_int32_t);
 
 /* Default hash routine. */
-extern u_int32_t (*__default_hash) __P((const void *, size_t));
+extern u_int32_t (*__default_hash) (const void *, size_t);
 
 #ifdef HASH_STATISTICS
 extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
Index: lib/libc/db/hash/hash.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- lib/libc/db/hash/hash.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash.c	12 Nov 2003 17:18:55 -0000
@@ -57,23 +57,23 @@
 #include "page.h"
 #include "extern.h"
 
-static int   alloc_segs __P((HTAB *, int));
-static int   flush_meta __P((HTAB *));
-static int   hash_access __P((HTAB *, ACTION, DBT *, DBT *));
-static int   hash_close __P((DB *));
-static int   hash_delete __P((const DB *, const DBT *, u_int32_t));
-static int   hash_fd __P((const DB *));
-static int   hash_get __P((const DB *, const DBT *, DBT *, u_int32_t));
-static int   hash_put __P((const DB *, DBT *, const DBT *, u_int32_t));
-static void *hash_realloc __P((SEGMENT **, int, int));
-static int   hash_seq __P((const DB *, DBT *, DBT *, u_int32_t));
-static int   hash_sync __P((const DB *, u_int32_t));
-static int   hdestroy __P((HTAB *));
-static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *));
-static int   init_htab __P((HTAB *, int));
+static int   alloc_segs (HTAB *, int);
+static int   flush_meta (HTAB *);
+static int   hash_access (HTAB *, ACTION, DBT *, DBT *);
+static int   hash_close (DB *);
+static int   hash_delete (const DB *, const DBT *, u_int32_t);
+static int   hash_fd (const DB *);
+static int   hash_get (const DB *, const DBT *, DBT *, u_int32_t);
+static int   hash_put (const DB *, DBT *, const DBT *, u_int32_t);
+static void *hash_realloc (SEGMENT **, int, int);
+static int   hash_seq (const DB *, DBT *, DBT *, u_int32_t);
+static int   hash_sync (const DB *, u_int32_t);
+static int   hdestroy (HTAB *);
+static HTAB *init_hash (HTAB *, const char *, HASHINFO *);
+static int   init_htab (HTAB *, int);
 #if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header __P((HTAB *));
-static void  swap_header_copy __P((HASHHDR *, HASHHDR *));
+static void  swap_header (HTAB *);
+static void  swap_header_copy (HASHHDR *, HASHHDR *);
 #endif
 
 /* Fast arithmetic, relying on powers of 2, */
Index: lib/libc/db/hash/hash.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash.h,v
retrieving revision 1.2
diff -u -r1.2 hash.h
--- lib/libc/db/hash/hash.h	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash.h	12 Nov 2003 17:18:55 -0000
@@ -97,7 +97,7 @@
 	int		exsegs;		/* Number of extra allocated 
 					 * segments */
 	u_int32_t			/* Hash function */
-	    (*hash)__P((const void *, size_t));
+	    (*hash)(const void *, size_t);
 	int		flags;		/* Flag values */
 	int		fp;		/* File pointer */
 	char		*tmp_buf;	/* Temporary Buffer for BIG data */
Index: lib/libc/db/hash/hash_bigkey.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash_bigkey.c,v
retrieving revision 1.2
diff -u -r1.2 hash_bigkey.c
--- lib/libc/db/hash/hash_bigkey.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash_bigkey.c	12 Nov 2003 17:18:55 -0000
@@ -70,8 +70,8 @@
 #include "page.h"
 #include "extern.h"
 
-static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
-static int collect_data __P((HTAB *, BUFHEAD *, int, int));
+static int collect_key (HTAB *, BUFHEAD *, int, DBT *, int);
+static int collect_data (HTAB *, BUFHEAD *, int, int);
 
 /*
  * Big_insert
Index: lib/libc/db/hash/hash_buf.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash_buf.c,v
retrieving revision 1.2
diff -u -r1.2 hash_buf.c
--- lib/libc/db/hash/hash_buf.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash_buf.c	12 Nov 2003 17:18:55 -0000
@@ -70,7 +70,7 @@
 #include "page.h"
 #include "extern.h"
 
-static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *));
+static BUFHEAD *newbuf (HTAB *, u_int32_t, BUFHEAD *);
 
 /* Unlink B from its place in the lru */
 #define BUF_REMOVE(B) { \
Index: lib/libc/db/hash/hash_func.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash_func.c,v
retrieving revision 1.2
diff -u -r1.2 hash_func.c
--- lib/libc/db/hash/hash_func.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash_func.c	12 Nov 2003 17:18:55 -0000
@@ -43,13 +43,13 @@
 #include "page.h"
 #include "extern.h"
 
-static u_int32_t hash1 __P((const void *, size_t));
-static u_int32_t hash2 __P((const void *, size_t));
-static u_int32_t hash3 __P((const void *, size_t));
-static u_int32_t hash4 __P((const void *, size_t));
+static u_int32_t hash1 (const void *, size_t);
+static u_int32_t hash2 (const void *, size_t);
+static u_int32_t hash3 (const void *, size_t);
+static u_int32_t hash4 (const void *, size_t);
 
 /* Global default hash function */
-u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
+u_int32_t (*__default_hash) (const void *, size_t) = hash4;
 
 /*
  * HASH FUNCTIONS
Index: lib/libc/db/hash/hash_page.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/hash/hash_page.c,v
retrieving revision 1.2
diff -u -r1.2 hash_page.c
--- lib/libc/db/hash/hash_page.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libc/db/hash/hash_page.c	12 Nov 2003 17:18:55 -0000
@@ -73,14 +73,14 @@
 #include "page.h"
 #include "extern.h"
 
-static u_int32_t	*fetch_bitmap __P((HTAB *, int));
-static u_int32_t	 first_free __P((u_int32_t));
-static int	 open_temp __P((HTAB *));
-static u_int16_t	 overflow_page __P((HTAB *));
-static void	 putpair __P((char *, const DBT *, const DBT *));
-static void	 squeeze_key __P((u_int16_t *, const DBT *, const DBT *));
+static u_int32_t	*fetch_bitmap (HTAB *, int);
+static u_int32_t	 first_free (u_int32_t);
+static int	 open_temp (HTAB *);
+static u_int16_t	 overflow_page (HTAB *);
+static void	 putpair (char *, const DBT *, const DBT *);
+static void	 squeeze_key (u_int16_t *, const DBT *, const DBT *);
 static int	 ugly_split
-		    __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int));
+		    (HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int);
 
 #define	PAGE_INIT(P) { \
 	((u_int16_t *)(P))[0] = 0; \
Index: lib/libc/db/mpool/mpool.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/mpool/mpool.c,v
retrieving revision 1.2
diff -u -r1.2 mpool.c
--- lib/libc/db/mpool/mpool.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/db/mpool/mpool.c	12 Nov 2003 17:18:55 -0000
@@ -51,9 +51,9 @@
 #define	__MPOOLINTERFACE_PRIVATE
 #include <mpool.h>
 
-static BKT *mpool_bkt __P((MPOOL *));
-static BKT *mpool_look __P((MPOOL *, pgno_t));
-static int  mpool_write __P((MPOOL *, BKT *));
+static BKT *mpool_bkt (MPOOL *);
+static BKT *mpool_look (MPOOL *, pgno_t);
+static int  mpool_write (MPOOL *, BKT *);
 
 /*
  * mpool_open --
@@ -102,8 +102,8 @@
 void
 mpool_filter(mp, pgin, pgout, pgcookie)
 	MPOOL *mp;
-	void (*pgin) __P((void *, pgno_t, void *));
-	void (*pgout) __P((void *, pgno_t, void *));
+	void (*pgin) (void *, pgno_t, void *);
+	void (*pgout) (void *, pgno_t, void *);
 	void *pgcookie;
 {
 	mp->pgin = pgin;
Index: lib/libc/db/recno/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/recno/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libc/db/recno/extern.h	17 Jun 2003 02:50:42 -0000	1.1
+++ lib/libc/db/recno/extern.h	12 Nov 2003 17:18:55 -0000
@@ -35,20 +35,20 @@
 
 #include "../btree/extern.h"
 
-int	 __rec_close __P((DB *));
-int	 __rec_delete __P((const DB *, const DBT *, u_int));
-int	 __rec_dleaf __P((BTREE *, PAGE *, u_int32_t));
-int	 __rec_fd __P((const DB *));
-int	 __rec_fmap __P((BTREE *, recno_t));
-int	 __rec_fout __P((BTREE *));
-int	 __rec_fpipe __P((BTREE *, recno_t));
-int	 __rec_get __P((const DB *, const DBT *, DBT *, u_int));
-int	 __rec_iput __P((BTREE *, recno_t, const DBT *, u_int));
-int	 __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *));
-EPG	*__rec_search __P((BTREE *, recno_t, enum SRCHOP));
-int	 __rec_seq __P((const DB *, DBT *, DBT *, u_int));
-int	 __rec_sync __P((const DB *, u_int));
-int	 __rec_vmap __P((BTREE *, recno_t));
-int	 __rec_vout __P((BTREE *));
-int	 __rec_vpipe __P((BTREE *, recno_t));
+int	 __rec_close (DB *);
+int	 __rec_delete (const DB *, const DBT *, u_int);
+int	 __rec_dleaf (BTREE *, PAGE *, u_int32_t);
+int	 __rec_fd (const DB *);
+int	 __rec_fmap (BTREE *, recno_t);
+int	 __rec_fout (BTREE *);
+int	 __rec_fpipe (BTREE *, recno_t);
+int	 __rec_get (const DB *, const DBT *, DBT *, u_int);
+int	 __rec_iput (BTREE *, recno_t, const DBT *, u_int);
+int	 __rec_put (const DB *dbp, DBT *, const DBT *, u_int);
+int	 __rec_ret (BTREE *, EPG *, recno_t, DBT *, DBT *);
+EPG	*__rec_search (BTREE *, recno_t, enum SRCHOP);
+int	 __rec_seq (const DB *, DBT *, DBT *, u_int);
+int	 __rec_sync (const DB *, u_int);
+int	 __rec_vmap (BTREE *, recno_t);
+int	 __rec_vout (BTREE *);
+int	 __rec_vpipe (BTREE *, recno_t);
Index: lib/libc/db/recno/rec_delete.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/recno/rec_delete.c,v
retrieving revision 1.2
diff -u -r1.2 rec_delete.c
--- lib/libc/db/recno/rec_delete.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/db/recno/rec_delete.c	12 Nov 2003 17:18:55 -0000
@@ -46,7 +46,7 @@
 #include <db.h>
 #include "recno.h"
 
-static int rec_rdelete __P((BTREE *, recno_t));
+static int rec_rdelete (BTREE *, recno_t);
 
 /*
  * __REC_DELETE -- Delete the item(s) referenced by a key.
Index: lib/libc/db/test/dbtest.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/test/dbtest.c,v
retrieving revision 1.2
diff -u -r1.2 dbtest.c
--- lib/libc/db/test/dbtest.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/db/test/dbtest.c	12 Nov 2003 17:18:55 -0000
@@ -52,22 +52,22 @@
 
 enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
 
-void	 compare __P((DBT *, DBT *));
-DBTYPE	 dbtype __P((char *));
-void	 dump __P((DB *, int));
-void	 err __P((const char *, ...));
-void	 get __P((DB *, DBT *));
-void	 getdata __P((DB *, DBT *, DBT *));
-void	 put __P((DB *, DBT *, DBT *));
-void	 rem __P((DB *, DBT *));
-char	*sflags __P((int));
-void	 synk __P((DB *));
-void	*rfile __P((char *, size_t *));
-void	 seq __P((DB *, DBT *));
-u_int	 setflags __P((char *));
-void	*setinfo __P((DBTYPE, char *));
-void	 usage __P((void));
-void	*xmalloc __P((char *, size_t));
+void	 compare (DBT *, DBT *);
+DBTYPE	 dbtype (char *);
+void	 dump (DB *, int);
+void	 err (const char *, ...);
+void	 get (DB *, DBT *);
+void	 getdata (DB *, DBT *, DBT *);
+void	 put (DB *, DBT *, DBT *);
+void	 rem (DB *, DBT *);
+char	*sflags (int);
+void	 synk (DB *);
+void	*rfile (char *, size_t *);
+void	 seq (DB *, DBT *);
+u_int	 setflags (char *);
+void	*setinfo (DBTYPE, char *);
+void	 usage (void);
+void	*xmalloc (char *, size_t);
 
 DBTYPE type;				/* Database type. */
 void *infop;				/* Iflags. */
Index: lib/libc/db/test/btree.tests/main.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/db/test/btree.tests/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- lib/libc/db/test/btree.tests/main.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/db/test/btree.tests/main.c	12 Nov 2003 17:18:55 -0000
@@ -50,37 +50,37 @@
 	char *cmd;
 	int nargs;
 	int rconv;
-	void (*func) __P((DB *, char **));
+	void (*func) (DB *, char **);
 	char *usage, *descrip;
 } cmd_table;
 
 int stopstop;
 DB *globaldb;
 
-void append	__P((DB *, char **));
-void bstat	__P((DB *, char **));
-void cursor	__P((DB *, char **));
-void delcur	__P((DB *, char **));
-void delete	__P((DB *, char **));
-void dump	__P((DB *, char **));
-void first	__P((DB *, char **));
-void get	__P((DB *, char **));
-void help	__P((DB *, char **));
-void iafter	__P((DB *, char **));
-void ibefore	__P((DB *, char **));
-void icursor	__P((DB *, char **));
-void insert	__P((DB *, char **));
-void keydata	__P((DBT *, DBT *));
-void last	__P((DB *, char **));
-void list	__P((DB *, char **));
-void load	__P((DB *, char **));
-void mstat	__P((DB *, char **));
-void next	__P((DB *, char **));
-int  parse	__P((char *, char **, int));
-void previous	__P((DB *, char **));
-void show	__P((DB *, char **));
-void usage	__P((void));
-void user	__P((DB *));
+void append	(DB *, char **);
+void bstat	(DB *, char **);
+void cursor	(DB *, char **);
+void delcur	(DB *, char **);
+void delete	(DB *, char **);
+void dump	(DB *, char **);
+void first	(DB *, char **);
+void get	(DB *, char **);
+void help	(DB *, char **);
+void iafter	(DB *, char **);
+void ibefore	(DB *, char **);
+void icursor	(DB *, char **);
+void insert	(DB *, char **);
+void keydata	(DBT *, DBT *);
+void last	(DB *, char **);
+void list	(DB *, char **);
+void load	(DB *, char **);
+void mstat	(DB *, char **);
+void next	(DB *, char **);
+int  parse	(char *, char **, int);
+void previous	(DB *, char **);
+void show	(DB *, char **);
+void usage	(void);
+void user	(DB *);
 
 cmd_table commands[] = {
 	"?",	0, 0, help, "help", NULL,
Index: lib/libc/gen/closedir.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/closedir.c,v
retrieving revision 1.2
diff -u -r1.2 closedir.c
--- lib/libc/gen/closedir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/closedir.c	12 Nov 2003 17:18:55 -0000
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-extern void _reclaim_telldir __P((DIR *));
+extern void _reclaim_telldir (DIR *);
 
 /*
  * close a directory.
Index: lib/libc/gen/disklabel.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/disklabel.c,v
retrieving revision 1.3
diff -u -r1.3 disklabel.c
--- lib/libc/gen/disklabel.c	8 Aug 2003 04:18:33 -0000	1.3
+++ lib/libc/gen/disklabel.c	12 Nov 2003 17:18:55 -0000
@@ -48,7 +48,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-static int	gettype __P((char *, char **));
+static int	gettype (char *, char **);
 
 struct disklabel *
 getdiskbyname(name)
Index: lib/libc/gen/fnmatch.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/fnmatch.c,v
retrieving revision 1.2
diff -u -r1.2 fnmatch.c
--- lib/libc/gen/fnmatch.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/fnmatch.c	12 Nov 2003 17:18:55 -0000
@@ -54,7 +54,7 @@
 #define RANGE_NOMATCH   0
 #define RANGE_ERROR     (-1)
 
-static int rangematch __P((const char *, char, int, char **));
+static int rangematch (const char *, char, int, char **);
 
 int
 fnmatch(pattern, string, flags)
Index: lib/libc/gen/fstab.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/fstab.c,v
retrieving revision 1.2
diff -u -r1.2 fstab.c
--- lib/libc/gen/fstab.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/fstab.c	12 Nov 2003 17:18:55 -0000
@@ -53,9 +53,9 @@
 static struct fstab _fs_fstab;
 static int LineNo = 0;
 
-static void error __P((int));
-static void fixfsfile __P((void));
-static int fstabscan __P((void));
+static void error (int);
+static void fixfsfile (void);
+static int fstabscan (void);
 
 static void
 fixfsfile()
Index: lib/libc/gen/fts.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/fts.c,v
retrieving revision 1.2
diff -u -r1.2 fts.c
--- lib/libc/gen/fts.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/fts.c	12 Nov 2003 17:18:55 -0000
@@ -50,16 +50,16 @@
 #include <string.h>
 #include <unistd.h>
 
-static FTSENT	*fts_alloc __P((FTS *, char *, int));
-static FTSENT	*fts_build __P((FTS *, int));
-static void	 fts_lfree __P((FTSENT *));
-static void	 fts_load __P((FTS *, FTSENT *));
-static size_t	 fts_maxarglen __P((char * const *));
-static void	 fts_padjust __P((FTS *, FTSENT *));
-static int	 fts_palloc __P((FTS *, size_t));
-static u_short	 fts_stat __P((FTS *, FTSENT *, int));
-static int	 fts_safe_changedir __P((FTS *, FTSENT *, int, char *));
+static FTSENT	*fts_alloc (FTS *, char *, int);
+static FTSENT	*fts_build (FTS *, int);
+static void	 fts_lfree (FTSENT *);
+static void	 fts_load (FTS *, FTSENT *);
+static size_t	 fts_maxarglen (char * const *);
+static void	 fts_padjust (FTS *, FTSENT *);
+static int	 fts_palloc (FTS *, size_t);
+static FTSENT	*fts_sort (FTS *, FTSENT *, int);
+static u_short	 fts_stat (FTS *, FTSENT *, int);
+static int	 fts_safe_changedir (FTS *, FTSENT *, int, char *);
 
 #define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
 
@@ -78,7 +78,7 @@
 fts_open(argv, options, compar)
 	char * const *argv;
 	register int options;
-	int (*compar) __P((const FTSENT **, const FTSENT **));
+	int (*compar) (const FTSENT **, const FTSENT **);
 {
 	register FTS *sp;
 	register FTSENT *p, *root;
Index: lib/libc/gen/getcap.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/getcap.c,v
retrieving revision 1.2
diff -u -r1.2 getcap.c
--- lib/libc/gen/getcap.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/getcap.c	12 Nov 2003 17:18:55 -0000
@@ -65,9 +65,9 @@
 static char	*toprec;	/* Additional record specified by cgetset() */
 static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
 
-static int	cdbget __P((DB *, char **, char *));
-static int 	getent __P((char **, u_int *, char **, int, char *, int, char *));
-static int	nfcmp __P((char *, char *));
+static int	cdbget (DB *, char **, char *);
+static int 	getent (char **, u_int *, char **, int, char *, int, char *);
+static int	nfcmp (char *, char *);
 
 /*
  * Cgetset() allows the addition of a user specified buffer to be added
Index: lib/libc/gen/getpwent.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/getpwent.c,v
retrieving revision 1.2
diff -u -r1.2 getpwent.c
--- lib/libc/gen/getpwent.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/getpwent.c	12 Nov 2003 17:18:55 -0000
@@ -49,9 +49,9 @@
 #include <limits.h>
 #include <grp.h>
 
-extern void setnetgrent __P(( char * ));
-extern int getnetgrent __P(( char **, char **, char ** ));
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
+extern void setnetgrent ( char * );
+extern int getnetgrent ( char **, char **, char ** );
+extern int innetgr ( const char *, const char *, const char *, const char * );
 
 /*
  * The lookup techniques and data extraction code here must be kept
@@ -79,16 +79,16 @@
 #define YP_HAVE_NONE 0
 static int _gotmaster;
 static char *_pw_yp_domain;
-static inline int unwind __P(( char * ));
-static void _ypinitdb __P(( void ));
-static int _havemaster __P((char *));
-static int _getyppass __P((struct passwd *, const char *, const char * ));
-static int _nextyppass __P((struct passwd *));
-static inline int lookup __P((const char *));
-static inline void store __P((const char *));
-static inline int ingr __P((const char *, const char*));
-static inline int verf __P((const char *));
-static char * _get_adjunct_pw __P((const char *));
+static inline int unwind ( char * );
+static void _ypinitdb ( void );
+static int _havemaster (char *);
+static int _getyppass (struct passwd *, const char *, const char * );
+static int _nextyppass (struct passwd *);
+static inline int lookup (const char *);
+static inline void store (const char *);
+static inline int ingr (const char *, const char*);
+static inline int verf (const char *);
+static char * _get_adjunct_pw (const char *);
 #endif
 static int __hashpw(DBT *);
 static int __initdb(void);
Index: lib/libc/gen/getttyent.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/getttyent.c,v
retrieving revision 1.2
diff -u -r1.2 getttyent.c
--- lib/libc/gen/getttyent.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/getttyent.c	12 Nov 2003 17:18:55 -0000
@@ -49,8 +49,8 @@
 
 #define	MALLOCCHUNK	100
 
-static char *skip __P((char *));
-static char *value __P((char *));
+static char *skip (char *);
+static char *value (char *);
 
 struct ttyent *
 getttynam(tty)
Index: lib/libc/gen/getusershell.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/getusershell.c,v
retrieving revision 1.2
diff -u -r1.2 getusershell.c
--- lib/libc/gen/getusershell.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/getusershell.c	12 Nov 2003 17:18:55 -0000
@@ -54,7 +54,7 @@
 
 static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
 static char **curshell, **shells, *strings;
-static char **initshells __P((void));
+static char **initshells (void);
 
 /*
  * Get a list of shells from _PATH_SHELLS, if it exists.
Index: lib/libc/gen/nlist.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/nlist.c,v
retrieving revision 1.2
diff -u -r1.2 nlist.c
--- lib/libc/gen/nlist.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/nlist.c	12 Nov 2003 17:18:55 -0000
@@ -55,9 +55,9 @@
 #include <elf-hints.h>
 #endif
 
-int __fdnlist		__P((int, struct nlist *));
-int __aout_fdnlist	__P((int, struct nlist *));
-int __elf_fdnlist	__P((int, struct nlist *));
+int __fdnlist		(int, struct nlist *);
+int __aout_fdnlist	(int, struct nlist *);
+int __elf_fdnlist	(int, struct nlist *);
 
 int
 nlist(name, list)
@@ -75,7 +75,7 @@
 }
 
 static struct nlist_handlers {
-	int	(*fn) __P((int fd, struct nlist *list));
+	int	(*fn) (int fd, struct nlist *list);
 } nlist_fn[] = {
 #ifdef _NLIST_DO_AOUT
 	{ __aout_fdnlist },
@@ -199,7 +199,7 @@
 #endif
 
 #ifdef _NLIST_DO_ELF
-static void elf_sym_to_nlist __P((struct nlist *, Elf_Sym *, Elf_Shdr *, int));
+static void elf_sym_to_nlist (struct nlist *, Elf_Sym *, Elf_Shdr *, int);
 
 /*
  * __elf_is_okay__ - Determine if ehdr really
Index: lib/libc/gen/rand48.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/rand48.h,v
retrieving revision 1.1
diff -u -r1.1 rand48.h
--- lib/libc/gen/rand48.h	17 Jun 2003 02:50:47 -0000	1.1
+++ lib/libc/gen/rand48.h	12 Nov 2003 17:18:56 -0000
@@ -17,7 +17,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-void		_dorand48 __P((unsigned short[3]));
+void		_dorand48 (unsigned short[3]);
 
 #define	RAND48_SEED_0	(0x330e)
 #define	RAND48_SEED_1	(0xabcd)
Index: lib/libc/gen/rewinddir.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/rewinddir.c,v
retrieving revision 1.2
diff -u -r1.2 rewinddir.c
--- lib/libc/gen/rewinddir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/rewinddir.c	12 Nov 2003 17:18:56 -0000
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-extern void _seekdir __P(( DIR *, long ));
+extern void _seekdir ( DIR *, long );
 
 void
 rewinddir(dirp)
Index: lib/libc/gen/scandir.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/scandir.c,v
retrieving revision 1.2
diff -u -r1.2 scandir.c
--- lib/libc/gen/scandir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/scandir.c	12 Nov 2003 17:18:56 -0000
@@ -64,8 +64,8 @@
 scandir(dirname, namelist, select, dcomp)
 	const char *dirname;
 	struct dirent ***namelist;
-	int (*select) __P((struct dirent *));
-	int (*dcomp) __P((const void *, const void *));
+	int (*select) (struct dirent *);
+	int (*dcomp) (const void *, const void *);
 {
 	register struct dirent *d, *p, **names = NULL;
 	register size_t nitems = 0;
Index: lib/libc/gen/seekdir.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/seekdir.c,v
retrieving revision 1.2
diff -u -r1.2 seekdir.c
--- lib/libc/gen/seekdir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/seekdir.c	12 Nov 2003 17:18:56 -0000
@@ -39,7 +39,7 @@
 #include <sys/param.h>
 #include <dirent.h>
 
-extern void _seekdir __P(( DIR *, long ));
+extern void _seekdir ( DIR *, long );
 
 /*
  * Seek to an entry in a directory.
Index: lib/libc/gen/setmode.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/setmode.c,v
retrieving revision 1.2
diff -u -r1.2 setmode.c
--- lib/libc/gen/setmode.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/setmode.c	12 Nov 2003 17:18:56 -0000
@@ -65,10 +65,10 @@
 #define	CMD2_OBITS	0x08
 #define	CMD2_UBITS	0x10
 
-static BITCMD	*addcmd __P((BITCMD *, int, int, int, u_int));
-static void	 compress_mode __P((BITCMD *));
+static BITCMD	*addcmd (BITCMD *, int, int, int, u_int);
+static void	 compress_mode (BITCMD *);
 #ifdef SETMODE_DEBUG
-static void	 dumpmode __P((BITCMD *));
+static void	 dumpmode (BITCMD *);
 #endif
 
 /*
Index: lib/libc/gen/syslog.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/syslog.c,v
retrieving revision 1.2
diff -u -r1.2 syslog.c
--- lib/libc/gen/syslog.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/syslog.c	12 Nov 2003 17:18:56 -0000
@@ -65,8 +65,8 @@
 static int	LogMask = 0xff;		/* mask of priorities to be logged */
 extern char	*__progname;		/* Program name, from crt0. */
 
-static void	disconnectlog __P((void)); /* disconnect from syslogd */
-static void	connectlog __P((void));	/* (re)connect to syslogd */
+static void	disconnectlog (void); /* disconnect from syslogd */
+static void	connectlog (void);	/* (re)connect to syslogd */
 
 /*
  * Format of the magic cookie passed through the stdio hook
Index: lib/libc/gen/ttyname.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gen/ttyname.c,v
retrieving revision 1.2
diff -u -r1.2 ttyname.c
--- lib/libc/gen/ttyname.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gen/ttyname.c	12 Nov 2003 17:18:56 -0000
@@ -155,7 +155,7 @@
 }
 #else
 static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
-static char *oldttyname __P((int, struct stat *));
+static char *oldttyname (int, struct stat *);
 
 char *
 ttyname(fd)
Index: lib/libc/gmon/gmon.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gmon/gmon.c,v
retrieving revision 1.2
diff -u -r1.2 gmon.c
--- lib/libc/gmon/gmon.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gmon/gmon.c	12 Nov 2003 17:18:56 -0000
@@ -63,8 +63,8 @@
 
 #define ERR(s) _write(2, s, sizeof(s))
 
-void	moncontrol __P((int));
-static int hertz __P((void));
+void	moncontrol (int);
+static int hertz (void);
 
 void
 monstartup(lowpc, highpc)
Index: lib/libc/gmon/mcount.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/gmon/mcount.c,v
retrieving revision 1.2
diff -u -r1.2 mcount.c
--- lib/libc/gmon/mcount.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libc/gmon/mcount.c	12 Nov 2003 17:18:56 -0000
@@ -42,10 +42,10 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-void	bintr __P((void));
-void	btrap __P((void));
-void	eintr __P((void));
-void	user __P((void));
+void	bintr (void);
+void	btrap (void);
+void	eintr (void);
+void	user (void);
 #endif
 
 /*
Index: lib/libc/include/spinlock.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/include/spinlock.h,v
retrieving revision 1.2
diff -u -r1.2 spinlock.h
--- lib/libc/include/spinlock.h	17 Jun 2003 04:26:43 -0000	1.2
+++ lib/libc/include/spinlock.h	12 Nov 2003 17:18:56 -0000
@@ -64,9 +64,9 @@
  * Thread function prototype definitions:
  */
 __BEGIN_DECLS
-long	_atomic_lock __P((volatile long *));
-void	_spinlock __P((spinlock_t *));
-void	_spinlock_debug __P((spinlock_t *, char *, int));
+long	_atomic_lock (volatile long *);
+void	_spinlock (spinlock_t *);
+void	_spinlock_debug (spinlock_t *, char *, int);
 __END_DECLS
 
 #endif /* _SPINLOCK_H_ */
Index: lib/libc/locale/big5.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/locale/big5.c,v
retrieving revision 1.2
diff -u -r1.2 big5.c
--- lib/libc/locale/big5.c	17 Jun 2003 04:26:43 -0000	1.2
+++ lib/libc/locale/big5.c	12 Nov 2003 17:18:56 -0000
@@ -45,8 +45,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-rune_t	_BIG5_sgetrune __P((const char *, size_t, char const **));
-int	_BIG5_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_BIG5_sgetrune (const char *, size_t, char const **);
+int	_BIG5_sputrune (rune_t, char *, size_t, char **);
 
 int
 _BIG5_init(rl)
Index: lib/libc/locale/mskanji.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/locale/mskanji.c,v
retrieving revision 1.2
diff -u -r1.2 mskanji.c
--- lib/libc/locale/mskanji.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/locale/mskanji.c	12 Nov 2003 17:18:56 -0000
@@ -43,8 +43,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-rune_t	_MSKanji_sgetrune __P((const char *, size_t, char const **));
-int	_MSKanji_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_MSKanji_sgetrune (const char *, size_t, char const **);
+int	_MSKanji_sputrune (rune_t, char *, size_t, char **);
 
 int
 _MSKanji_init(rl)
Index: lib/libc/locale/none.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/locale/none.c,v
retrieving revision 1.2
diff -u -r1.2 none.c
--- lib/libc/locale/none.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/locale/none.c	12 Nov 2003 17:18:56 -0000
@@ -44,8 +44,8 @@
 #include <rune.h>
 #include <stdlib.h>
 
-rune_t	_none_sgetrune __P((const char *, size_t, char const **));
-int	_none_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_none_sgetrune (const char *, size_t, char const **);
+int	_none_sputrune (rune_t, char *, size_t, char **);
 
 int
 _none_init(rl)
Index: lib/libc/locale/table.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/locale/table.c,v
retrieving revision 1.3
diff -u -r1.3 table.c
--- lib/libc/locale/table.c	9 Nov 2003 02:34:01 -0000	1.3
+++ lib/libc/locale/table.c	12 Nov 2003 17:18:56 -0000
@@ -43,9 +43,9 @@
 #include <rune.h>
 #include <stdlib.h>
 
-extern rune_t	_none_sgetrune __P((const char *, size_t, char const **));
-extern int	_none_sputrune __P((rune_t, char *, size_t, char **));
-extern int	_none_init __P((char *, char **));
+extern rune_t	_none_sgetrune (const char *, size_t, char const **);
+extern int	_none_sputrune (rune_t, char *, size_t, char **);
+extern int	_none_init (char *, char **);
 
 _RuneLocale _DefaultRuneLocale = {
     _RUNE_MAGIC_1,
Index: lib/libc/locale/utf2.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/locale/utf2.c,v
retrieving revision 1.2
diff -u -r1.2 utf2.c
--- lib/libc/locale/utf2.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/locale/utf2.c	12 Nov 2003 17:18:56 -0000
@@ -44,8 +44,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-rune_t	_UTF2_sgetrune __P((const char *, size_t, char const **));
-int	_UTF2_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_UTF2_sgetrune (const char *, size_t, char const **);
+int	_UTF2_sputrune (rune_t, char *, size_t, char **);
 
 static int _utf_count[16] = {
 	1, 1, 1, 1, 1, 1, 1, 1,
Index: lib/libc/net/getaddrinfo.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/getaddrinfo.c,v
retrieving revision 1.2
diff -u -r1.2 getaddrinfo.c
--- lib/libc/net/getaddrinfo.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/getaddrinfo.c	12 Nov 2003 17:31:16 -0000
@@ -184,44 +184,44 @@
 	int n;			/* result length */
 };
 
-static int str_isnumber __P((const char *));
-static int explore_fqdn __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int explore_null __P((const struct addrinfo *,
-	const char *, struct addrinfo **));
-static int explore_numeric __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int explore_numeric_scope __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int get_canonname __P((const struct addrinfo *,
-	struct addrinfo *, const char *));
-static struct addrinfo *get_ai __P((const struct addrinfo *,
-	const struct afd *, const char *));
-static int get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
-static int addrconfig __P((struct addrinfo *));
+static int str_isnumber (const char *);
+static int explore_fqdn (const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_null (const struct addrinfo *,
+	const char *, struct addrinfo **);
+static int explore_numeric (const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_numeric_scope (const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int get_canonname (const struct addrinfo *,
+	struct addrinfo *, const char *);
+static struct addrinfo *get_ai (const struct addrinfo *,
+	const struct afd *, const char *);
+static int get_portmatch (const struct addrinfo *, const char *);
+static int get_port (struct addrinfo *, const char *, int);
+static const struct afd *find_afd (int);
+static int addrconfig (struct addrinfo *);
 #ifdef INET6
-static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *, u_int32_t *));
+static int ip6_str2scopeid (char *, struct sockaddr_in6 *, u_int32_t *);
 #endif
 
-static struct addrinfo *getanswer __P((const querybuf *, int, const char *,
-	int, const struct addrinfo *));
-static int _dns_getaddrinfo __P((const struct addrinfo *, const char *,
-	struct addrinfo **));
-static struct addrinfo *_gethtent __P((FILE *fp, const char *,
-	const struct addrinfo *));
-static int _files_getaddrinfo __P((const struct addrinfo *, const char *,
-	struct addrinfo **));
+static struct addrinfo *getanswer (const querybuf *, int, const char *,
+	int, const struct addrinfo *);
+static int _dns_getaddrinfo (const struct addrinfo *, const char *,
+	struct addrinfo **);
+static struct addrinfo *_gethtent (FILE *fp, const char *,
+	const struct addrinfo *);
+static int _files_getaddrinfo (const struct addrinfo *, const char *,
+	struct addrinfo **);
 #ifdef YP
-static int _nis_getaddrinfo __P((const struct addrinfo *, const char *,
-	struct addrinfo **));
+static int _nis_getaddrinfo (const struct addrinfo *, const char *,
+	struct addrinfo **);
 #endif
 
-static int res_queryN __P((const char *, struct res_target *));
-static int res_searchN __P((const char *, struct res_target *));
-static int res_querydomainN __P((const char *, const char *,
-	struct res_target *));
+static int res_queryN (const char *, struct res_target *);
+static int res_searchN (const char *, struct res_target *);
+static int res_querydomainN (const char *, const char *,
+	struct res_target *);
 
 static char *ai_errlist[] = {
 	"Success",
@@ -1295,7 +1295,7 @@
 	int type, class, ancount, qdcount;
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 	char hostbuf[8*1024];
 
 	memset(&sentinel, 0, sizeof(sentinel));
@@ -1759,7 +1759,7 @@
 
 /* resolver logic */
 
-extern const char *__hostalias __P((const char *));
+extern const char *__hostalias (const char *);
 extern int h_errno;
 
 /*
Index: lib/libc/net/gethostbydns.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/gethostbydns.c,v
retrieving revision 1.2
diff -u -r1.2 gethostbydns.c
--- lib/libc/net/gethostbydns.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/gethostbydns.c	12 Nov 2003 17:18:56 -0000
@@ -93,7 +93,7 @@
 static u_char host_addr[16];	/* IPv4 or IPv6 */
 
 #ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort (char **, int);
 #endif
 
 #define MAXPACKET	(64*1024)
@@ -162,7 +162,7 @@
 	int toobig = 0;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 
 	tname = qname;
 	host.h_name = NULL;
Index: lib/libc/net/getnameinfo.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/getnameinfo.c,v
retrieving revision 1.2
diff -u -r1.2 getnameinfo.c
--- lib/libc/net/getnameinfo.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/getnameinfo.c	12 Nov 2003 17:31:36 -0000
@@ -79,9 +79,9 @@
 };
 
 #ifdef INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
-    size_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
+static int ip6_parsenumeric (const struct sockaddr *, const char *, char *,
+    size_t, int);
+static int ip6_sa2str (const struct sockaddr_in6 *, char *, size_t, int);
 #endif
 
 int
Index: lib/libc/net/getservent.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/getservent.c,v
retrieving revision 1.2
diff -u -r1.2 getservent.c
--- lib/libc/net/getservent.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/getservent.c	12 Nov 2003 17:18:56 -0000
@@ -44,7 +44,7 @@
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
+extern int _yp_check ( char ** );
 #endif
 
 
Index: lib/libc/net/inet_net_ntop.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/inet_net_ntop.c,v
retrieving revision 1.2
diff -u -r1.2 inet_net_ntop.c
--- lib/libc/net/inet_net_ntop.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/inet_net_ntop.c	12 Nov 2003 17:32:12 -0000
@@ -34,8 +34,8 @@
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
+static char *	inet_net_ntop_ipv4 (const u_char *src, int bits,
+					char *dst, size_t size);
 
 /*
  * char *
Index: lib/libc/net/inet_net_pton.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/inet_net_pton.c,v
retrieving revision 1.2
diff -u -r1.2 inet_net_pton.c
--- lib/libc/net/inet_net_pton.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/inet_net_pton.c	12 Nov 2003 17:32:28 -0000
@@ -37,8 +37,8 @@
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
+static int	inet_net_pton_ipv4 (const char *src, u_char *dst,
+					size_t size);
 
 /*
  * static int
Index: lib/libc/net/inet_ntop.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/inet_ntop.c,v
retrieving revision 1.2
diff -u -r1.2 inet_ntop.c
--- lib/libc/net/inet_ntop.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/inet_ntop.c	12 Nov 2003 17:18:56 -0000
@@ -32,8 +32,8 @@
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop4 (const u_char *src, char *dst, size_t size);
+static const char *inet_ntop6 (const u_char *src, char *dst, size_t size);
 
 /* char *
  * inet_ntop(af, src, dst, size)
Index: lib/libc/net/inet_pton.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/inet_pton.c,v
retrieving revision 1.2
diff -u -r1.2 inet_pton.c
--- lib/libc/net/inet_pton.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/inet_pton.c	12 Nov 2003 17:18:56 -0000
@@ -33,8 +33,8 @@
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
+static int	inet_pton4 (const char *src, u_char *dst);
+static int	inet_pton6 (const char *src, u_char *dst);
 
 /* int
  * inet_pton(af, src, dst)
Index: lib/libc/net/name6.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/name6.c,v
retrieving revision 1.2
diff -u -r1.2 name6.c
--- lib/libc/net/name6.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/name6.c	12 Nov 2003 17:32:40 -0000
@@ -1025,8 +1025,8 @@
 	u_char buf[MAXPACKET];
 } querybuf;
 
-static struct hostent *getanswer __P((const querybuf *, int, const char *,
-	int, struct hostent *, int *));
+static struct hostent *getanswer (const querybuf *, int, const char *,
+	int, struct hostent *, int *);
 
 /*
  * we don't need to take care about sorting, nor IPv4 mapped address here.
@@ -1049,7 +1049,7 @@
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 	static char *h_addr_ptrs[MAXADDRS + 1];
 	static char *host_aliases[MAXALIASES];
 	static char hostbuf[8*1024];
Index: lib/libc/net/rcmd.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/rcmd.c,v
retrieving revision 1.2
diff -u -r1.2 rcmd.c
--- lib/libc/net/rcmd.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/rcmd.c	12 Nov 2003 17:35:29 -0000
@@ -65,17 +65,17 @@
 #define NI_WITHSCOPEID	0
 #endif
 
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
+extern int innetgr ( const char *, const char *, const char *, const char * );
 
 #define max(a, b)	((a > b) ? a : b)
 
-int	__ivaliduser __P((FILE *, u_int32_t, const char *, const char *));
-int __ivaliduser_af __P((FILE *,const void *, const char *, const char *,
-	int, int));
-int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t,
-	const char *,const char *));
-static int __icheckhost __P((const struct sockaddr *, socklen_t,
-	const char *));
+int	__ivaliduser (FILE *, u_int32_t, const char *, const char *);
+int __ivaliduser_af (FILE *,const void *, const char *, const char *,
+	int, int);
+int __ivaliduser_sa (FILE *, const struct sockaddr *, socklen_t,
+	const char *,const char *);
+static int __icheckhost (const struct sockaddr *, socklen_t,
+	const char *);
 
 char paddr[NI_MAXHOST];
 
Index: lib/libc/net/res_init.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/res_init.c,v
retrieving revision 1.2
diff -u -r1.2 res_init.c
--- lib/libc/net/res_init.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/res_init.c	12 Nov 2003 17:18:57 -0000
@@ -90,12 +90,12 @@
 
 #include "res_config.h"
 
-static void res_setoptions __P((char *, char *));
+static void res_setoptions (char *, char *);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask (struct in_addr);
 #endif
 
 #if !defined(isascii) /* XXX - could be a function */
Index: lib/libc/net/res_send.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/net/res_send.c,v
retrieving revision 1.2
diff -u -r1.2 res_send.c
--- lib/libc/net/res_send.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/net/res_send.c	12 Nov 2003 17:18:57 -0000
@@ -121,8 +121,8 @@
 		} else {}
 static char abuf[NI_MAXHOST];
 static char pbuf[NI_MAXSERV];
-static void Aerror __P((FILE *, char *, int, struct sockaddr *));
-static void Perror __P((FILE *, char *, int));
+static void Aerror (FILE *, char *, int, struct sockaddr *);
+static void Perror (FILE *, char *, int);
 
     static void
     Aerror(file, string, error, address)
@@ -177,7 +177,7 @@
 	Rhook = hook;
 }
 
-static struct sockaddr * get_nsaddr __P((size_t));
+static struct sockaddr * get_nsaddr (size_t);
 
 /*
  * pick appropriate nsaddr_list for use.  see res_init() for initialization.
Index: lib/libc/quad/quad.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/quad/quad.h,v
retrieving revision 1.2
diff -u -r1.2 quad.h
--- lib/libc/quad/quad.h	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/quad/quad.h	12 Nov 2003 17:18:57 -0000
@@ -97,11 +97,11 @@
 #define	LHALF(x)	((x) & ((1 << HALF_BITS) - 1))
 #define	LHUP(x)		((x) << HALF_BITS)
 
-quad_t		__divdi3 __P((quad_t a, quad_t b));
-quad_t		__moddi3 __P((quad_t a, quad_t b));
-u_quad_t	__qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem));
-u_quad_t	__udivdi3 __P((u_quad_t a, u_quad_t b));
-u_quad_t	__umoddi3 __P((u_quad_t a, u_quad_t b));
+quad_t		__divdi3 (quad_t a, quad_t b);
+quad_t		__moddi3 (quad_t a, quad_t b);
+u_quad_t	__qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem);
+u_quad_t	__udivdi3 (u_quad_t a, u_quad_t b);
+u_quad_t	__umoddi3 (u_quad_t a, u_quad_t b);
 
 /*
  * XXX
Index: lib/libc/regex/engine.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/regex/engine.c,v
retrieving revision 1.2
diff -u -r1.2 engine.c
--- lib/libc/regex/engine.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/regex/engine.c	12 Nov 2003 17:18:57 -0000
@@ -93,12 +93,12 @@
 #endif
 
 /* === engine.c === */
-static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags));
-static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev));
-static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft));
+static int matcher (struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
+static char *dissect (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *backref (struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
+static char *fast (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *slow (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static states step (struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
 #define	BOL	(OUT+1)
 #define	EOL	(BOL+1)
 #define	BOLEOL	(BOL+2)
@@ -109,13 +109,13 @@
 #define	NONCHAR(c)	((c) > CHAR_MAX)
 #define	NNONCHAR	(CODEMAX-CHAR_MAX)
 #ifdef REDEBUG
-static void print __P((struct match *m, char *caption, states st, int ch, FILE *d));
+static void print (struct match *m, char *caption, states st, int ch, FILE *d);
 #endif
 #ifdef REDEBUG
-static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst));
+static void at (struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
 #endif
 #ifdef REDEBUG
-static char *pchar __P((int ch));
+static char *pchar (int ch);
 #endif
 
 #ifdef __cplusplus
Index: lib/libc/regex/regcomp.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/regex/regcomp.c,v
retrieving revision 1.2
diff -u -r1.2 regcomp.c
--- lib/libc/regex/regcomp.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/regex/regcomp.c	12 Nov 2003 17:18:57 -0000
@@ -82,51 +82,51 @@
 #endif
 
 /* === regcomp.c === */
-static void p_ere __P((struct parse *p, int stop));
-static void p_ere_exp __P((struct parse *p));
-static void p_str __P((struct parse *p));
-static void p_bre __P((struct parse *p, int end1, int end2));
-static int p_simp_re __P((struct parse *p, int starordinary));
-static int p_count __P((struct parse *p));
-static void p_bracket __P((struct parse *p));
-static void p_b_term __P((struct parse *p, cset *cs));
-static void p_b_cclass __P((struct parse *p, cset *cs));
-static void p_b_eclass __P((struct parse *p, cset *cs));
-static char p_b_symbol __P((struct parse *p));
-static char p_b_coll_elem __P((struct parse *p, int endc));
-static char othercase __P((int ch));
-static void bothcases __P((struct parse *p, int ch));
-static void ordinary __P((struct parse *p, int ch));
-static void nonnewline __P((struct parse *p));
-static void repeat __P((struct parse *p, sopno start, int from, int to));
-static int seterr __P((struct parse *p, int e));
-static cset *allocset __P((struct parse *p));
-static void freeset __P((struct parse *p, cset *cs));
-static int freezeset __P((struct parse *p, cset *cs));
-static int firstch __P((struct parse *p, cset *cs));
-static int nch __P((struct parse *p, cset *cs));
-static void mcadd __P((struct parse *p, cset *cs, char *cp));
+static void p_ere (struct parse *p, int stop);
+static void p_ere_exp (struct parse *p);
+static void p_str (struct parse *p);
+static void p_bre (struct parse *p, int end1, int end2);
+static int p_simp_re (struct parse *p, int starordinary);
+static int p_count (struct parse *p);
+static void p_bracket (struct parse *p);
+static void p_b_term (struct parse *p, cset *cs);
+static void p_b_cclass (struct parse *p, cset *cs);
+static void p_b_eclass (struct parse *p, cset *cs);
+static char p_b_symbol (struct parse *p);
+static char p_b_coll_elem (struct parse *p, int endc);
+static char othercase (int ch);
+static void bothcases (struct parse *p, int ch);
+static void ordinary (struct parse *p, int ch);
+static void repeat (struct parse *p, sopno start, int from, int to);
+static int seterr (struct parse *p, int e);
+static cset *allocset (struct parse *p);
+static void freeset (struct parse *p, cset *cs);
+static int freezeset (struct parse *p, cset *cs);
+static int firstch (struct parse *p, cset *cs);
+static int nch (struct parse *p, cset *cs);
+static void mcadd (struct parse *p, cset *cs, char *cp);
 #if used
-static void mcsub __P((cset *cs, char *cp));
-static int mcin __P((cset *cs, char *cp));
-static char *mcfind __P((cset *cs, char *cp));
+static void mcsub (cset *cs, char *cp);
+static int mcin (cset *cs, char *cp);
+static char *mcfind (cset *cs, char *cp);
 #endif
-static void mcinvert __P((struct parse *p, cset *cs));
-static void mccase __P((struct parse *p, cset *cs));
-static int isinsets __P((struct re_guts *g, int c));
-static int samesets __P((struct re_guts *g, int c1, int c2));
-static void categorize __P((struct parse *p, struct re_guts *g));
-static sopno dupl __P((struct parse *p, sopno start, sopno finish));
-static void doemit __P((struct parse *p, sop op, size_t opnd));
-static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos));
-static void dofwd __P((struct parse *p, sopno pos, sop value));
-static void enlarge __P((struct parse *p, sopno size));
-static void stripsnug __P((struct parse *p, struct re_guts *g));
-static void findmust __P((struct parse *p, struct re_guts *g));
-static int altoffset __P((sop *scan, int offset, int mccs));
-static void computejumps __P((struct parse *p, struct re_guts *g));
-static void computematchjumps __P((struct parse *p, struct re_guts *g));
-static sopno pluscount __P((struct parse *p, struct re_guts *g));
+static void mcinvert (struct parse *p, cset *cs);
+static void mccase (struct parse *p, cset *cs);
+static int isinsets (struct re_guts *g, int c);
+static int samesets (struct re_guts *g, int c1, int c2);
+static void categorize (struct parse *p, struct re_guts *g);
+static sopno dupl (struct parse *p, sopno start, sopno finish);
+static void doemit (struct parse *p, sop op, size_t opnd);
+static void doinsert (struct parse *p, sop op, size_t opnd, sopno pos);
+static void dofwd (struct parse *p, sopno pos, sop value);
+static void enlarge (struct parse *p, sopno size);
+static void stripsnug (struct parse *p, struct re_guts *g);
+static void findmust (struct parse *p, struct re_guts *g);
+static int altoffset (sop *scan, int offset, int mccs);
+static void computejumps (struct parse *p, struct re_guts *g);
+static void computematchjumps (struct parse *p, struct re_guts *g);
+static sopno pluscount (struct parse *p, struct re_guts *g);
 
 #ifdef __cplusplus
 }
Index: lib/libc/regex/regerror.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/regex/regerror.c,v
retrieving revision 1.2
diff -u -r1.2 regerror.c
--- lib/libc/regex/regerror.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/regex/regerror.c	12 Nov 2003 17:18:57 -0000
@@ -54,7 +54,7 @@
 #endif
 
 /* === regerror.c === */
-static char *regatoi __P((const regex_t *preg, char *localbuf));
+static char *regatoi (const regex_t *preg, char *localbuf);
 
 #ifdef __cplusplus
 }
Index: lib/libc/rpc/auth_des.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/auth_des.c,v
retrieving revision 1.2
diff -u -r1.2 auth_des.c
--- lib/libc/rpc/auth_des.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/rpc/auth_des.c	12 Nov 2003 17:35:46 -0000
@@ -50,11 +50,11 @@
 #undef NIS
 #include <rpcsvc/nis.h>
 
-extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *,
-						char *, char **, struct sockaddr_in * ));
-extern int rtime __P(( struct sockaddr_in *, struct timeval *, struct timeval *));
-extern bool_t xdr_authdes_cred __P(( XDR *, struct authdes_cred * ));
-extern bool_t xdr_authdes_verf __P(( XDR *, struct authdes_verf * ));
+extern bool_t __rpc_get_time_offset ( struct timeval *, nis_server *,
+						char *, char **, struct sockaddr_in * );
+extern int rtime ( struct sockaddr_in *, struct timeval *, struct timeval *);
+extern bool_t xdr_authdes_cred ( XDR *, struct authdes_cred * );
+extern bool_t xdr_authdes_verf ( XDR *, struct authdes_verf * );
 
 #define MILLION		1000000L
 #define RTIME_TIMEOUT 5		/* seconds to wait for sync */
@@ -82,7 +82,7 @@
 	authdes_destroy
 };
 #ifdef foo
-static bool_t	synchronize __P(( struct sockaddr *, struct timeval *));
+static bool_t	synchronize ( struct sockaddr *, struct timeval *);
 #endif
 /*
  * This struct is pointed to by the ah_private field of an "AUTH *"
Index: lib/libc/rpc/des_crypt.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/des_crypt.c,v
retrieving revision 1.2
diff -u -r1.2 des_crypt.c
--- lib/libc/rpc/des_crypt.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libc/rpc/des_crypt.c	12 Nov 2003 17:18:57 -0000
@@ -39,9 +39,9 @@
 #include <rpc/des_crypt.h>
 #include <rpc/des.h>
 
-static int common_crypt	__P(( char *, char *, register unsigned, unsigned, struct desparams * ));
+static int common_crypt	( char *, char *, register unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
-extern _des_crypt_call __P(( char *, int, struct desparams * ));
+extern _des_crypt_call ( char *, int, struct desparams * );
 /*
  * Copy 8 bytes
  */
Index: lib/libc/rpc/key_call.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/key_call.c,v
retrieving revision 1.2
diff -u -r1.2 key_call.c
--- lib/libc/rpc/key_call.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libc/rpc/key_call.c	12 Nov 2003 17:18:57 -0000
@@ -82,7 +82,7 @@
 cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
 des_block *(*__key_gendes_LOCAL)() = 0;
 
-static int key_call __P(( u_long, xdrproc_t, char *, xdrproc_t, char * ));
+static int key_call ( u_long, xdrproc_t, char *, xdrproc_t, char * );
 
 int
 key_setsecret(secretkey)
Index: lib/libc/rpc/netnamer.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/netnamer.c,v
retrieving revision 1.2
diff -u -r1.2 netnamer.c
--- lib/libc/rpc/netnamer.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libc/rpc/netnamer.c	12 Nov 2003 17:18:57 -0000
@@ -57,8 +57,8 @@
 static char    *NETID = "netid.byname";
 static char    *NETIDFILE = "/etc/netid";
 
-static int getnetid __P(( char *, char * ));
-static int _getgroups __P(( char *, gid_t * ));
+static int getnetid ( char *, char * );
+static int _getgroups ( char *, gid_t * );
 
 #ifndef NGROUPS
 #define NGROUPS 16
Index: lib/libc/rpc/rtime.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/rtime.c,v
retrieving revision 1.2
diff -u -r1.2 rtime.c
--- lib/libc/rpc/rtime.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libc/rpc/rtime.c	12 Nov 2003 17:18:57 -0000
@@ -56,12 +56,12 @@
 #include <stdio.h>
 #include <netdb.h>
 
-extern int _rpc_dtablesize __P(( void ));
+extern int _rpc_dtablesize ( void );
 
 #define NYEARS	(unsigned long)(1970 - 1900)
 #define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
 
-static void do_close __P(( int ));
+static void do_close ( int );
 
 int
 rtime(addrp, timep, timeout)
Index: lib/libc/rpc/svc_udp.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/rpc/svc_udp.c,v
retrieving revision 1.2
diff -u -r1.2 svc_udp.c
--- lib/libc/rpc/svc_udp.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libc/rpc/svc_udp.c	12 Nov 2003 17:18:57 -0000
@@ -57,8 +57,8 @@
 static bool_t		svcudp_getargs();
 static bool_t		svcudp_freeargs();
 static void		svcudp_destroy();
-static void		cache_set __P((SVCXPRT *, u_long));
-static int		cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *));
+static void		cache_set (SVCXPRT *, u_long);
+static int		cache_get (SVCXPRT *, struct rpc_msg *, char **, u_long *);
 
 static struct xp_ops svcudp_op = {
 	svcudp_recv,
Index: lib/libc/stdio/findfp.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/findfp.c,v
retrieving revision 1.2
diff -u -r1.2 findfp.c
--- lib/libc/stdio/findfp.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libc/stdio/findfp.c	12 Nov 2003 17:18:57 -0000
@@ -81,7 +81,7 @@
 FILE *__stdoutp = &__sF[1];
 FILE *__stderrp = &__sF[2];
 
-static struct glue *	moreglue __P((int));
+static struct glue *	moreglue (int);
 
 static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
 #define THREAD_LOCK()	if (__isthreaded) _SPINLOCK(&thread_lock)
Index: lib/libc/stdio/fseek.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/fseek.c,v
retrieving revision 1.2
diff -u -r1.2 fseek.c
--- lib/libc/stdio/fseek.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/fseek.c	12 Nov 2003 17:18:57 -0000
@@ -68,7 +68,7 @@
 	off_t offset;
 	int whence;
 {
-	register fpos_t (*seekfn) __P((void *, fpos_t, int));
+	register fpos_t (*seekfn) (void *, fpos_t, int);
 	fpos_t target, curoff;
 	size_t n;
 	struct stat st;
Index: lib/libc/stdio/local.h
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/local.h,v
retrieving revision 1.3
diff -u -r1.3 local.h
--- lib/libc/stdio/local.h	9 Nov 2003 02:34:02 -0000	1.3
+++ lib/libc/stdio/local.h	12 Nov 2003 17:18:57 -0000
@@ -48,21 +48,21 @@
  * in particular, macros and private variables.
  */
 
-extern int	__sflush __P((FILE *));
-extern FILE	*__sfp __P((void));
-extern int	__srefill __P((FILE *));
-extern int	__sread __P((void *, char *, int));
-extern int	__swrite __P((void *, char const *, int));
-extern fpos_t	__sseek __P((void *, fpos_t, int));
-extern int	__sclose __P((void *));
-extern void	__sinit __P((void));
-extern void	_cleanup __P((void));
-extern void	(*__cleanup) __P((void));
-extern void	__smakebuf __P((FILE *));
-extern int	__swhatbuf __P((FILE *, __size_t *, int *));
-extern int	_fwalk __P((int (*)(FILE *)));
-extern int	__swsetup __P((FILE *));
-extern int	__sflags __P((const char *, int *));
+extern int	__sflush (FILE *);
+extern FILE	*__sfp (void);
+extern int	__srefill (FILE *);
+extern int	__sread (void *, char *, int);
+extern int	__swrite (void *, char const *, int);
+extern fpos_t	__sseek (void *, fpos_t, int);
+extern int	__sclose (void *);
+extern void	__sinit (void);
+extern void	_cleanup (void);
+extern void	(*__cleanup) (void);
+extern void	__smakebuf (FILE *);
+extern int	__swhatbuf (FILE *, __size_t *, int *);
+extern int	_fwalk (int (*)(FILE *));
+extern int	__swsetup (FILE *);
+extern int	__sflags (const char *, int *);
 
 extern int	__sdidinit;
 
Index: lib/libc/stdio/mktemp.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/mktemp.c,v
retrieving revision 1.2
diff -u -r1.2 mktemp.c
--- lib/libc/stdio/mktemp.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/mktemp.c	12 Nov 2003 17:18:57 -0000
@@ -45,9 +45,9 @@
 #include <ctype.h>
 #include <unistd.h>
 
-char *_mktemp __P((char *));
+char *_mktemp (char *);
 
-static int _gettemp __P((char *, int *, int, int));
+static int _gettemp (char *, int *, int, int);
 
 static const unsigned char padchar[] =
 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
Index: lib/libc/stdio/refill.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/refill.c,v
retrieving revision 1.2
diff -u -r1.2 refill.c
--- lib/libc/stdio/refill.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/refill.c	12 Nov 2003 17:18:57 -0000
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include "local.h"
 
-static int lflush __P((FILE *));
+static int lflush (FILE *);
 
 static int
 lflush(FILE *fp)
Index: lib/libc/stdio/sscanf.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/sscanf.c,v
retrieving revision 1.2
diff -u -r1.2 sscanf.c
--- lib/libc/stdio/sscanf.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/sscanf.c	12 Nov 2003 17:18:57 -0000
@@ -47,7 +47,7 @@
 #endif
 #include "local.h"
 
-static int eofread __P((void *, char *, int));
+static int eofread (void *, char *, int);
 
 /* ARGSUSED */
 static int
Index: lib/libc/stdio/tempnam.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/tempnam.c,v
retrieving revision 1.2
diff -u -r1.2 tempnam.c
--- lib/libc/stdio/tempnam.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/tempnam.c	12 Nov 2003 17:18:57 -0000
@@ -46,7 +46,7 @@
 __warn_references(tempnam,
     "warning: tempnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp (char *);
 
 char *
 tempnam(dir, pfx)
Index: lib/libc/stdio/tmpnam.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/tmpnam.c,v
retrieving revision 1.2
diff -u -r1.2 tmpnam.c
--- lib/libc/stdio/tmpnam.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/tmpnam.c	12 Nov 2003 17:18:57 -0000
@@ -47,7 +47,7 @@
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp (char *);
 
 char *
 tmpnam(s)
Index: lib/libc/stdio/ungetc.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/ungetc.c,v
retrieving revision 1.2
diff -u -r1.2 ungetc.c
--- lib/libc/stdio/ungetc.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/ungetc.c	12 Nov 2003 17:18:57 -0000
@@ -44,7 +44,7 @@
 #include "local.h"
 #include "libc_private.h"
 
-static int __submore __P((FILE *));
+static int __submore (FILE *);
 
 /*
  * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
Index: lib/libc/stdio/vfprintf.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/vfprintf.c,v
retrieving revision 1.2
diff -u -r1.2 vfprintf.c
--- lib/libc/stdio/vfprintf.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libc/stdio/vfprintf.c	12 Nov 2003 17:18:57 -0000
@@ -64,12 +64,12 @@
 /* Define FLOATING_POINT to get floating point. */
 #define	FLOATING_POINT
 
-static int	__sprint __P((FILE *, struct __suio *));
-static int	__sbprintf __P((FILE *, const char *, va_list));
-static char *	__ultoa __P((u_long, char *, int, int, char *));
-static char *	__uqtoa __P((u_quad_t, char *, int, int, char *));
-static void	__find_arguments __P((const char *, va_list, void ***));
-static void	__grow_type_table __P((int, unsigned char **, int *));
+static int	__sprint (FILE *, struct __suio *);
+static int	__sbprintf (FILE *, const char *, va_list);
+static char *	__ultoa (u_long, char *, int, int, char *);
+static char *	__uqtoa (u_quad_t, char *, int, int, char *);
+static void	__find_arguments (const char *, va_list, void ***);
+static void	__grow_type_table (int, unsigned char **, int *);
 
 /*
  * Flush out all the vectors defined by the given uio,
@@ -248,8 +248,8 @@
 #define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
 #define	DEFPREC		6
 
-static char *cvt __P((double, int, int, char *, int *, int, int *, char **));
-static int exponent __P((char *, int, int));
+static char *cvt (double, int, int, char *, int *, int, int *, char **);
+static int exponent (char *, int, int);
 
 #else /* no FLOATING_POINT */
 
@@ -1190,7 +1190,7 @@
 
 #ifdef FLOATING_POINT
 
-extern char *__dtoa __P((double, int, int, int *, int *, char **, char **));
+extern char *__dtoa (double, int, int, int *, int *, char **, char **);
 
 static char *
 cvt(double value, int ndigits, int flags, char *sign, int *decpt,
Index: lib/libc/stdio/vsscanf.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/stdio/vsscanf.c,v
retrieving revision 1.3
diff -u -r1.3 vsscanf.c
--- lib/libc/stdio/vsscanf.c	9 Nov 2003 02:34:02 -0000	1.3
+++ lib/libc/stdio/vsscanf.c	12 Nov 2003 17:18:57 -0000
@@ -43,7 +43,7 @@
 #include <string.h>
 
 static int
-eofread __P((void *, char *, int));
+eofread (void *, char *, int);
 
 /* ARGSUSED */
 static int
Index: lib/libc/xdr/xdr_rec.c
===================================================================
RCS file: /home/dcvs/src/lib/libc/xdr/xdr_rec.c,v
retrieving revision 1.2
diff -u -r1.2 xdr_rec.c
--- lib/libc/xdr/xdr_rec.c	17 Jun 2003 04:26:47 -0000	1.2
+++ lib/libc/xdr/xdr_rec.c	12 Nov 2003 17:18:58 -0000
@@ -103,7 +103,7 @@
 	/*
 	 * out-goung bits
 	 */
-	int (*writeit) __P((caddr_t, caddr_t, int));
+	int (*writeit) (caddr_t, caddr_t, int);
 	caddr_t out_base;	/* output buffer (points to frag header) */
 	caddr_t out_finger;	/* next output position */
 	caddr_t out_boundry;	/* data cannot up to this address */
@@ -112,7 +112,7 @@
 	/*
 	 * in-coming bits
 	 */
-	int (*readit) __P((caddr_t, caddr_t, int));
+	int (*readit) (caddr_t, caddr_t, int);
 	u_long in_size;	/* fixed size of the input buffer */
 	caddr_t in_base;
 	caddr_t in_finger;	/* location of next byte to be had */
Index: lib/libcr/db/btree/bt_close.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_close.c,v
retrieving revision 1.2
diff -u -r1.2 bt_close.c
--- lib/libcr/db/btree/bt_close.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_close.c	12 Nov 2003 17:19:00 -0000
@@ -50,7 +50,7 @@
 #include <db.h>
 #include "btree.h"
 
-static int bt_meta __P((BTREE *));
+static int bt_meta (BTREE *);
 
 /*
  * BT_CLOSE -- Close a btree.
Index: lib/libcr/db/btree/bt_conv.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_conv.c,v
retrieving revision 1.2
diff -u -r1.2 bt_conv.c
--- lib/libcr/db/btree/bt_conv.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_conv.c	12 Nov 2003 17:19:00 -0000
@@ -43,7 +43,7 @@
 #include <db.h>
 #include "btree.h"
 
-static void mswap __P((PAGE *));
+static void mswap (PAGE *);
 
 /*
  * __BT_BPGIN, __BT_BPGOUT --
Index: lib/libcr/db/btree/bt_delete.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_delete.c,v
retrieving revision 1.2
diff -u -r1.2 bt_delete.c
--- lib/libcr/db/btree/bt_delete.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_delete.c	12 Nov 2003 17:19:00 -0000
@@ -45,11 +45,11 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_bdelete __P((BTREE *, const DBT *));
-static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int));
-static int __bt_pdelete __P((BTREE *, PAGE *));
-static int __bt_relink __P((BTREE *, PAGE *));
-static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+static int __bt_bdelete (BTREE *, const DBT *);
+static int __bt_curdel (BTREE *, const DBT *, PAGE *, u_int);
+static int __bt_pdelete (BTREE *, PAGE *);
+static int __bt_relink (BTREE *, PAGE *);
+static int __bt_stkacq (BTREE *, PAGE **, CURSOR *);
 
 /*
  * __bt_delete
Index: lib/libcr/db/btree/bt_open.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_open.c,v
retrieving revision 1.2
diff -u -r1.2 bt_open.c
--- lib/libcr/db/btree/bt_open.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_open.c	12 Nov 2003 17:19:00 -0000
@@ -67,9 +67,9 @@
 #define	MINPSIZE	128
 #endif
 
-static int byteorder __P((void));
-static int nroot __P((BTREE *));
-static int tmp __P((void));
+static int byteorder (void);
+static int nroot (BTREE *);
+static int tmp (void);
 
 /*
  * __BT_OPEN -- Open a btree.
Index: lib/libcr/db/btree/bt_put.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_put.c,v
retrieving revision 1.2
diff -u -r1.2 bt_put.c
--- lib/libcr/db/btree/bt_put.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_put.c	12 Nov 2003 17:19:00 -0000
@@ -46,7 +46,7 @@
 #include <db.h>
 #include "btree.h"
 
-static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+static EPG *bt_fast (BTREE *, const DBT *, const DBT *, int *);
 
 /*
  * __BT_PUT -- Add a btree item to the tree.
Index: lib/libcr/db/btree/bt_search.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_search.c,v
retrieving revision 1.2
diff -u -r1.2 bt_search.c
--- lib/libcr/db/btree/bt_search.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_search.c	12 Nov 2003 17:19:00 -0000
@@ -43,8 +43,8 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
-static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+static int __bt_snext (BTREE *, PAGE *, const DBT *, int *);
+static int __bt_sprev (BTREE *, PAGE *, const DBT *, int *);
 
 /*
  * __bt_search --
Index: lib/libcr/db/btree/bt_seq.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_seq.c,v
retrieving revision 1.2
diff -u -r1.2 bt_seq.c
--- lib/libcr/db/btree/bt_seq.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_seq.c	12 Nov 2003 17:19:00 -0000
@@ -46,9 +46,9 @@
 #include <db.h>
 #include "btree.h"
 
-static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
-static int __bt_seqadv __P((BTREE *, EPG *, int));
-static int __bt_seqset __P((BTREE *, EPG *, DBT *, int));
+static int __bt_first (BTREE *, const DBT *, EPG *, int *);
+static int __bt_seqadv (BTREE *, EPG *, int);
+static int __bt_seqset (BTREE *, EPG *, DBT *, int);
 
 /*
  * Sequential scan support.
Index: lib/libcr/db/btree/bt_split.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/bt_split.c,v
retrieving revision 1.2
diff -u -r1.2 bt_split.c
--- lib/libcr/db/btree/bt_split.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/btree/bt_split.c	12 Nov 2003 17:19:00 -0000
@@ -46,16 +46,16 @@
 #include <db.h>
 #include "btree.h"
 
-static int	 bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
+static int	 bt_broot (BTREE *, PAGE *, PAGE *, PAGE *);
 static PAGE	*bt_page
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_preserve __P((BTREE *, pgno_t));
+		    (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_preserve (BTREE *, pgno_t);
 static PAGE	*bt_psplit
-		    __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t));
+		    (BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
 static PAGE	*bt_root
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *));
-static recno_t	 rec_total __P((PAGE *));
+		    (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_rroot (BTREE *, PAGE *, PAGE *, PAGE *);
+static recno_t	 rec_total (PAGE *);
 
 #ifdef STATISTICS
 u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
Index: lib/libcr/db/btree/btree.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/btree.h,v
retrieving revision 1.1
diff -u -r1.1 btree.h
--- lib/libcr/db/btree/btree.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libcr/db/btree/btree.h	12 Nov 2003 17:19:00 -0000
@@ -335,11 +335,11 @@
 	EPGNO	  bt_last;		/* last insert */
 
 					/* B: key comparison function */
-	int	(*bt_cmp) __P((const DBT *, const DBT *));
+	int	(*bt_cmp) (const DBT *, const DBT *);
 					/* B: prefix comparison function */
-	size_t	(*bt_pfx) __P((const DBT *, const DBT *));
+	size_t	(*bt_pfx) (const DBT *, const DBT *);
 					/* R: recno input function */
-	int	(*bt_irec) __P((struct _btree *, recno_t));
+	int	(*bt_irec) (struct _btree *, recno_t);
 
 	FILE	 *bt_rfp;		/* R: record FILE pointer */
 	int	  bt_rfd;		/* R: record file descriptor */
Index: lib/libcr/db/btree/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/btree/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libcr/db/btree/extern.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libcr/db/btree/extern.h	12 Nov 2003 17:19:00 -0000
@@ -33,38 +33,38 @@
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
  */
 
-int	 __bt_close __P((DB *));
-int	 __bt_cmp __P((BTREE *, const DBT *, EPG *));
-int	 __bt_crsrdel __P((BTREE *, EPGNO *));
-int	 __bt_defcmp __P((const DBT *, const DBT *));
-size_t	 __bt_defpfx __P((const DBT *, const DBT *));
-int	 __bt_delete __P((const DB *, const DBT *, u_int));
-int	 __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int));
-int	 __bt_fd __P((const DB *));
-int	 __bt_free __P((BTREE *, PAGE *));
-int	 __bt_get __P((const DB *, const DBT *, DBT *, u_int));
-PAGE	*__bt_new __P((BTREE *, pgno_t *));
-void	 __bt_pgin __P((void *, pgno_t, void *));
-void	 __bt_pgout __P((void *, pgno_t, void *));
-int	 __bt_push __P((BTREE *, pgno_t, int));
-int	 __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int));
-EPG	*__bt_search __P((BTREE *, const DBT *, int *));
-int	 __bt_seq __P((const DB *, DBT *, DBT *, u_int));
-void	 __bt_setcur __P((BTREE *, pgno_t, u_int));
-int	 __bt_split __P((BTREE *, PAGE *,
+int	 __bt_close (DB *);
+int	 __bt_cmp (BTREE *, const DBT *, EPG *);
+int	 __bt_crsrdel (BTREE *, EPGNO *);
+int	 __bt_defcmp (const DBT *, const DBT *);
+size_t	 __bt_defpfx (const DBT *, const DBT *);
+int	 __bt_delete (const DB *, const DBT *, u_int);
+int	 __bt_dleaf (BTREE *, const DBT *, PAGE *, u_int);
+int	 __bt_fd (const DB *);
+int	 __bt_free (BTREE *, PAGE *);
+int	 __bt_get (const DB *, const DBT *, DBT *, u_int);
+PAGE	*__bt_new (BTREE *, pgno_t *);
+void	 __bt_pgin (void *, pgno_t, void *);
+void	 __bt_pgout (void *, pgno_t, void *);
+int	 __bt_push (BTREE *, pgno_t, int);
+int	 __bt_put (const DB *dbp, DBT *, const DBT *, u_int);
+int	 __bt_ret (BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
+EPG	*__bt_search (BTREE *, const DBT *, int *);
+int	 __bt_seq (const DB *, DBT *, DBT *, u_int);
+void	 __bt_setcur (BTREE *, pgno_t, u_int);
+int	 __bt_split (BTREE *, PAGE *,
 	    const DBT *, const DBT *, int, size_t, u_int32_t));
-int	 __bt_sync __P((const DB *, u_int));
+int	 __bt_sync (const DB *, u_int);
 
-int	 __ovfl_delete __P((BTREE *, void *));
-int	 __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *));
-int	 __ovfl_put __P((BTREE *, const DBT *, pgno_t *));
+int	 __ovfl_delete (BTREE *, void *);
+int	 __ovfl_get (BTREE *, void *, size_t *, void **, size_t *);
+int	 __ovfl_put (BTREE *, const DBT *, pgno_t *);
 
 #ifdef DEBUG
-void	 __bt_dnpage __P((DB *, pgno_t));
-void	 __bt_dpage __P((PAGE *));
-void	 __bt_dump __P((DB *));
+void	 __bt_dnpage (DB *, pgno_t);
+void	 __bt_dpage (PAGE *);
+void	 __bt_dump (DB *);
 #endif
 #ifdef STATISTICS
-void	 __bt_stat __P((DB *));
+void	 __bt_stat (DB *);
 #endif
Index: lib/libcr/db/hash/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libcr/db/hash/extern.h	17 Jun 2003 02:50:41 -0000	1.1
+++ lib/libcr/db/hash/extern.h	12 Nov 2003 17:19:00 -0000
@@ -33,32 +33,32 @@
  *	@(#)extern.h	8.4 (Berkeley) 6/16/94
  */
 
-BUFHEAD	*__add_ovflpage __P((HTAB *, BUFHEAD *));
-int	 __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_delete __P((HTAB *, BUFHEAD *));
-int	 __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int));
-int	 __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int));
-int	 __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
+BUFHEAD	*__add_ovflpage (HTAB *, BUFHEAD *);
+int	 __addel (HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_delete (HTAB *, BUFHEAD *);
+int	 __big_insert (HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_keydata (HTAB *, BUFHEAD *, DBT *, DBT *, int);
+int	 __big_return (HTAB *, BUFHEAD *, int, DBT *, int);
+int	 __big_split (HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
 		int, u_int32_t, SPLIT_RETURN *));
-int	 __buf_free __P((HTAB *, int, int));
-void	 __buf_init __P((HTAB *, int));
-u_int32_t	 __call_hash __P((HTAB *, char *, int));
-int	 __delpair __P((HTAB *, BUFHEAD *, int));
-int	 __expand_table __P((HTAB *));
-int	 __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int));
-u_int16_t	 __find_last_page __P((HTAB *, BUFHEAD **));
-void	 __free_ovflpage __P((HTAB *, BUFHEAD *));
-BUFHEAD	*__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int));
-int	 __get_page __P((HTAB *, char *, u_int32_t, int, int, int));
-int	 __ibitmap __P((HTAB *, int, int, int));
-u_int32_t	 __log2 __P((u_int32_t));
-int	 __put_page __P((HTAB *, char *, u_int32_t, int, int));
-void	 __reclaim_buf __P((HTAB *, BUFHEAD *));
-int	 __split_page __P((HTAB *, u_int32_t, u_int32_t));
+int	 __buf_free (HTAB *, int, int);
+void	 __buf_init (HTAB *, int);
+u_int32_t	 __call_hash (HTAB *, char *, int);
+int	 __delpair (HTAB *, BUFHEAD *, int);
+int	 __expand_table (HTAB *);
+int	 __find_bigpair (HTAB *, BUFHEAD *, int, char *, int);
+u_int16_t	 __find_last_page (HTAB *, BUFHEAD **);
+void	 __free_ovflpage (HTAB *, BUFHEAD *);
+BUFHEAD	*__get_buf (HTAB *, u_int32_t, BUFHEAD *, int);
+int	 __get_page (HTAB *, char *, u_int32_t, int, int, int);
+int	 __ibitmap (HTAB *, int, int, int);
+u_int32_t	 __log2 (u_int32_t);
+int	 __put_page (HTAB *, char *, u_int32_t, int, int);
+void	 __reclaim_buf (HTAB *, BUFHEAD *);
+int	 __split_page (HTAB *, u_int32_t, u_int32_t);
 
 /* Default hash routine. */
-extern u_int32_t (*__default_hash) __P((const void *, size_t));
+extern u_int32_t (*__default_hash) (const void *, size_t);
 
 #ifdef HASH_STATISTICS
 extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
Index: lib/libcr/db/hash/hash.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- lib/libcr/db/hash/hash.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash.c	12 Nov 2003 17:19:00 -0000
@@ -57,23 +57,23 @@
 #include "page.h"
 #include "extern.h"
 
-static int   alloc_segs __P((HTAB *, int));
-static int   flush_meta __P((HTAB *));
-static int   hash_access __P((HTAB *, ACTION, DBT *, DBT *));
-static int   hash_close __P((DB *));
-static int   hash_delete __P((const DB *, const DBT *, u_int32_t));
-static int   hash_fd __P((const DB *));
-static int   hash_get __P((const DB *, const DBT *, DBT *, u_int32_t));
-static int   hash_put __P((const DB *, DBT *, const DBT *, u_int32_t));
-static void *hash_realloc __P((SEGMENT **, int, int));
-static int   hash_seq __P((const DB *, DBT *, DBT *, u_int32_t));
-static int   hash_sync __P((const DB *, u_int32_t));
-static int   hdestroy __P((HTAB *));
-static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *));
-static int   init_htab __P((HTAB *, int));
+static int   alloc_segs (HTAB *, int);
+static int   flush_meta (HTAB *);
+static int   hash_access (HTAB *, ACTION, DBT *, DBT *);
+static int   hash_close (DB *);
+static int   hash_delete (const DB *, const DBT *, u_int32_t);
+static int   hash_fd (const DB *);
+static int   hash_get (const DB *, const DBT *, DBT *, u_int32_t);
+static int   hash_put (const DB *, DBT *, const DBT *, u_int32_t);
+static void *hash_realloc (SEGMENT **, int, int);
+static int   hash_seq (const DB *, DBT *, DBT *, u_int32_t);
+static int   hash_sync (const DB *, u_int32_t);
+static int   hdestroy (HTAB *);
+static HTAB *init_hash (HTAB *, const char *, HASHINFO *);
+static int   init_htab (HTAB *, int);
 #if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header __P((HTAB *));
-static void  swap_header_copy __P((HASHHDR *, HASHHDR *));
+static void  swap_header (HTAB *);
+static void  swap_header_copy (HASHHDR *, HASHHDR *);
 #endif
 
 /* Fast arithmetic, relying on powers of 2, */
Index: lib/libcr/db/hash/hash.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash.h,v
retrieving revision 1.2
diff -u -r1.2 hash.h
--- lib/libcr/db/hash/hash.h	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash.h	12 Nov 2003 17:19:00 -0000
@@ -97,7 +97,7 @@
 	int		exsegs;		/* Number of extra allocated 
 					 * segments */
 	u_int32_t			/* Hash function */
-	    (*hash)__P((const void *, size_t));
+	    (*hash)(const void *, size_t);
 	int		flags;		/* Flag values */
 	int		fp;		/* File pointer */
 	char		*tmp_buf;	/* Temporary Buffer for BIG data */
Index: lib/libcr/db/hash/hash_bigkey.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash_bigkey.c,v
retrieving revision 1.2
diff -u -r1.2 hash_bigkey.c
--- lib/libcr/db/hash/hash_bigkey.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash_bigkey.c	12 Nov 2003 17:19:00 -0000
@@ -70,8 +70,8 @@
 #include "page.h"
 #include "extern.h"
 
-static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
-static int collect_data __P((HTAB *, BUFHEAD *, int, int));
+static int collect_key (HTAB *, BUFHEAD *, int, DBT *, int);
+static int collect_data (HTAB *, BUFHEAD *, int, int);
 
 /*
  * Big_insert
Index: lib/libcr/db/hash/hash_buf.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash_buf.c,v
retrieving revision 1.2
diff -u -r1.2 hash_buf.c
--- lib/libcr/db/hash/hash_buf.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash_buf.c	12 Nov 2003 17:19:00 -0000
@@ -70,7 +70,7 @@
 #include "page.h"
 #include "extern.h"
 
-static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *));
+static BUFHEAD *newbuf (HTAB *, u_int32_t, BUFHEAD *);
 
 /* Unlink B from its place in the lru */
 #define BUF_REMOVE(B) { \
Index: lib/libcr/db/hash/hash_func.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash_func.c,v
retrieving revision 1.2
diff -u -r1.2 hash_func.c
--- lib/libcr/db/hash/hash_func.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash_func.c	12 Nov 2003 17:19:00 -0000
@@ -43,13 +43,13 @@
 #include "page.h"
 #include "extern.h"
 
-static u_int32_t hash1 __P((const void *, size_t));
-static u_int32_t hash2 __P((const void *, size_t));
-static u_int32_t hash3 __P((const void *, size_t));
-static u_int32_t hash4 __P((const void *, size_t));
+static u_int32_t hash1 (const void *, size_t);
+static u_int32_t hash2 (const void *, size_t);
+static u_int32_t hash3 (const void *, size_t);
+static u_int32_t hash4 (const void *, size_t);
 
 /* Global default hash function */
-u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
+u_int32_t (*__default_hash) (const void *, size_t) = hash4;
 
 /*
  * HASH FUNCTIONS
Index: lib/libcr/db/hash/hash_page.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/hash/hash_page.c,v
retrieving revision 1.2
diff -u -r1.2 hash_page.c
--- lib/libcr/db/hash/hash_page.c	17 Jun 2003 04:26:41 -0000	1.2
+++ lib/libcr/db/hash/hash_page.c	12 Nov 2003 17:19:00 -0000
@@ -73,14 +73,14 @@
 #include "page.h"
 #include "extern.h"
 
-static u_int32_t	*fetch_bitmap __P((HTAB *, int));
-static u_int32_t	 first_free __P((u_int32_t));
-static int	 open_temp __P((HTAB *));
-static u_int16_t	 overflow_page __P((HTAB *));
-static void	 putpair __P((char *, const DBT *, const DBT *));
-static void	 squeeze_key __P((u_int16_t *, const DBT *, const DBT *));
+static u_int32_t	*fetch_bitmap (HTAB *, int);
+static u_int32_t	 first_free (u_int32_t);
+static int	 open_temp (HTAB *);
+static void	 putpair (char *, const DBT *, const DBT *);
+static void	 squeeze_key (u_int16_t *, const DBT *, const DBT *);
 static int	 ugly_split
-		    __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int));
+		    (HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int);
 
 #define	PAGE_INIT(P) { \
 	((u_int16_t *)(P))[0] = 0; \
Index: lib/libcr/db/mpool/mpool.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/mpool/mpool.c,v
retrieving revision 1.2
diff -u -r1.2 mpool.c
--- lib/libcr/db/mpool/mpool.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/db/mpool/mpool.c	12 Nov 2003 17:19:00 -0000
@@ -51,9 +51,9 @@
 #define	__MPOOLINTERFACE_PRIVATE
 #include <mpool.h>
 
-static BKT *mpool_bkt __P((MPOOL *));
-static BKT *mpool_look __P((MPOOL *, pgno_t));
-static int  mpool_write __P((MPOOL *, BKT *));
+static BKT *mpool_bkt (MPOOL *);
+static BKT *mpool_look (MPOOL *, pgno_t);
+static int  mpool_write (MPOOL *, BKT *);
 
 /*
  * mpool_open --
@@ -102,8 +102,8 @@
 void
 mpool_filter(mp, pgin, pgout, pgcookie)
 	MPOOL *mp;
-	void (*pgin) __P((void *, pgno_t, void *));
-	void (*pgout) __P((void *, pgno_t, void *));
+	void (*pgin) (void *, pgno_t, void *);
+	void (*pgout) (void *, pgno_t, void *);
 	void *pgcookie;
 {
 	mp->pgin = pgin;
Index: lib/libcr/db/recno/extern.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/recno/extern.h,v
retrieving revision 1.1
diff -u -r1.1 extern.h
--- lib/libcr/db/recno/extern.h	17 Jun 2003 02:50:42 -0000	1.1
+++ lib/libcr/db/recno/extern.h	12 Nov 2003 17:19:00 -0000
@@ -35,20 +35,20 @@
 
 #include "../btree/extern.h"
 
-int	 __rec_close __P((DB *));
-int	 __rec_delete __P((const DB *, const DBT *, u_int));
-int	 __rec_dleaf __P((BTREE *, PAGE *, u_int32_t));
-int	 __rec_fd __P((const DB *));
-int	 __rec_fmap __P((BTREE *, recno_t));
-int	 __rec_fout __P((BTREE *));
-int	 __rec_fpipe __P((BTREE *, recno_t));
-int	 __rec_get __P((const DB *, const DBT *, DBT *, u_int));
-int	 __rec_iput __P((BTREE *, recno_t, const DBT *, u_int));
-int	 __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *));
-EPG	*__rec_search __P((BTREE *, recno_t, enum SRCHOP));
-int	 __rec_seq __P((const DB *, DBT *, DBT *, u_int));
-int	 __rec_sync __P((const DB *, u_int));
-int	 __rec_vmap __P((BTREE *, recno_t));
-int	 __rec_vout __P((BTREE *));
-int	 __rec_vpipe __P((BTREE *, recno_t));
+int	 __rec_close (DB *);
+int	 __rec_delete (const DB *, const DBT *, u_int);
+int	 __rec_dleaf (BTREE *, PAGE *, u_int32_t);
+int	 __rec_fd (const DB *);
+int	 __rec_fmap (BTREE *, recno_t);
+int	 __rec_fout (BTREE *);
+int	 __rec_fpipe (BTREE *, recno_t);
+int	 __rec_get (const DB *, const DBT *, DBT *, u_int);
+int	 __rec_iput (BTREE *, recno_t, const DBT *, u_int);
+int	 __rec_put (const DB *dbp, DBT *, const DBT *, u_int);
+int	 __rec_ret (BTREE *, EPG *, recno_t, DBT *, DBT *);
+EPG	*__rec_search (BTREE *, recno_t, enum SRCHOP);
+int	 __rec_seq (const DB *, DBT *, DBT *, u_int);
+int	 __rec_sync (const DB *, u_int);
+int	 __rec_vmap (BTREE *, recno_t);
+int	 __rec_vout (BTREE *);
+int	 __rec_vpipe (BTREE *, recno_t);
Index: lib/libcr/db/recno/rec_delete.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/recno/rec_delete.c,v
retrieving revision 1.2
diff -u -r1.2 rec_delete.c
--- lib/libcr/db/recno/rec_delete.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/db/recno/rec_delete.c	12 Nov 2003 17:19:00 -0000
@@ -46,7 +46,7 @@
 #include <db.h>
 #include "recno.h"
 
-static int rec_rdelete __P((BTREE *, recno_t));
+static int rec_rdelete (BTREE *, recno_t);
 
 /*
  * __REC_DELETE -- Delete the item(s) referenced by a key.
Index: lib/libcr/db/test/dbtest.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/test/dbtest.c,v
retrieving revision 1.2
diff -u -r1.2 dbtest.c
--- lib/libcr/db/test/dbtest.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/db/test/dbtest.c	12 Nov 2003 17:19:00 -0000
@@ -52,22 +52,22 @@
 
 enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
 
-void	 compare __P((DBT *, DBT *));
-DBTYPE	 dbtype __P((char *));
-void	 dump __P((DB *, int));
-void	 err __P((const char *, ...));
-void	 get __P((DB *, DBT *));
-void	 getdata __P((DB *, DBT *, DBT *));
-void	 put __P((DB *, DBT *, DBT *));
-void	 rem __P((DB *, DBT *));
-char	*sflags __P((int));
-void	 synk __P((DB *));
-void	*rfile __P((char *, size_t *));
-void	 seq __P((DB *, DBT *));
-u_int	 setflags __P((char *));
-void	*setinfo __P((DBTYPE, char *));
-void	 usage __P((void));
-void	*xmalloc __P((char *, size_t));
+void	 compare (DBT *, DBT *);
+DBTYPE	 dbtype (char *);
+void	 dump (DB *, int);
+void	 err (const char *, ...);
+void	 get (DB *, DBT *);
+void	 getdata (DB *, DBT *, DBT *);
+void	 put (DB *, DBT *, DBT *);
+void	 rem (DB *, DBT *);
+char	*sflags (int);
+void	 synk (DB *);
+void	*rfile (char *, size_t *);
+void	 seq (DB *, DBT *);
+u_int	 setflags (char *);
+void	*setinfo (DBTYPE, char *);
+void	 usage (void);
+void	*xmalloc (char *, size_t);
 
 DBTYPE type;				/* Database type. */
 void *infop;				/* Iflags. */
Index: lib/libcr/db/test/btree.tests/main.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/db/test/btree.tests/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- lib/libcr/db/test/btree.tests/main.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/db/test/btree.tests/main.c	12 Nov 2003 17:19:00 -0000
@@ -50,37 +50,37 @@
 	char *cmd;
 	int nargs;
 	int rconv;
-	void (*func) __P((DB *, char **));
+	void (*func) (DB *, char **);
 	char *usage, *descrip;
 } cmd_table;
 
 int stopstop;
 DB *globaldb;
 
-void append	__P((DB *, char **));
-void bstat	__P((DB *, char **));
-void cursor	__P((DB *, char **));
-void delcur	__P((DB *, char **));
-void delete	__P((DB *, char **));
-void dump	__P((DB *, char **));
-void first	__P((DB *, char **));
-void get	__P((DB *, char **));
-void help	__P((DB *, char **));
-void iafter	__P((DB *, char **));
-void ibefore	__P((DB *, char **));
-void icursor	__P((DB *, char **));
-void insert	__P((DB *, char **));
-void keydata	__P((DBT *, DBT *));
-void last	__P((DB *, char **));
-void list	__P((DB *, char **));
-void load	__P((DB *, char **));
-void mstat	__P((DB *, char **));
-void next	__P((DB *, char **));
-int  parse	__P((char *, char **, int));
-void previous	__P((DB *, char **));
-void show	__P((DB *, char **));
-void usage	__P((void));
-void user	__P((DB *));
+void append	(DB *, char **);
+void bstat	(DB *, char **);
+void cursor	(DB *, char **);
+void delcur	(DB *, char **);
+void delete	(DB *, char **);
+void dump	(DB *, char **);
+void first	(DB *, char **);
+void get	(DB *, char **);
+void help	(DB *, char **);
+void iafter	(DB *, char **);
+void ibefore	(DB *, char **);
+void icursor	(DB *, char **);
+void insert	(DB *, char **);
+void keydata	(DBT *, DBT *);
+void last	(DB *, char **);
+void list	(DB *, char **);
+void load	(DB *, char **);
+void mstat	(DB *, char **);
+void next	(DB *, char **);
+int  parse	(char *, char **, int);
+void previous	(DB *, char **);
+void show	(DB *, char **);
+void usage	(void);
+void user	(DB *);
 
 cmd_table commands[] = {
 	"?",	0, 0, help, "help", NULL,
Index: lib/libcr/gen/closedir.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/closedir.c,v
retrieving revision 1.2
diff -u -r1.2 closedir.c
--- lib/libcr/gen/closedir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/closedir.c	12 Nov 2003 17:19:00 -0000
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-extern void _reclaim_telldir __P((DIR *));
+extern void _reclaim_telldir (DIR *);
 
 /*
  * close a directory.
Index: lib/libcr/gen/disklabel.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/disklabel.c,v
retrieving revision 1.3
diff -u -r1.3 disklabel.c
--- lib/libcr/gen/disklabel.c	8 Aug 2003 04:18:34 -0000	1.3
+++ lib/libcr/gen/disklabel.c	12 Nov 2003 17:19:00 -0000
@@ -48,7 +48,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-static int	gettype __P((char *, char **));
+static int	gettype (char *, char **);
 
 struct disklabel *
 getdiskbyname(name)
Index: lib/libcr/gen/fnmatch.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/fnmatch.c,v
retrieving revision 1.2
diff -u -r1.2 fnmatch.c
--- lib/libcr/gen/fnmatch.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/fnmatch.c	12 Nov 2003 17:19:00 -0000
@@ -54,7 +54,7 @@
 #define RANGE_NOMATCH   0
 #define RANGE_ERROR     (-1)
 
-static int rangematch __P((const char *, char, int, char **));
+static int rangematch (const char *, char, int, char **);
 
 int
 fnmatch(pattern, string, flags)
Index: lib/libcr/gen/fstab.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/fstab.c,v
retrieving revision 1.2
diff -u -r1.2 fstab.c
--- lib/libcr/gen/fstab.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/fstab.c	12 Nov 2003 17:19:00 -0000
@@ -53,9 +53,9 @@
 static struct fstab _fs_fstab;
 static int LineNo = 0;
 
-static void error __P((int));
-static void fixfsfile __P((void));
-static int fstabscan __P((void));
+static void error (int);
+static void fixfsfile (void);
+static int fstabscan (void);
 
 static void
 fixfsfile()
Index: lib/libcr/gen/fts.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/fts.c,v
retrieving revision 1.2
diff -u -r1.2 fts.c
--- lib/libcr/gen/fts.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/fts.c	12 Nov 2003 17:19:01 -0000
@@ -50,16 +50,16 @@
 #include <string.h>
 #include <unistd.h>
 
-static FTSENT	*fts_alloc __P((FTS *, char *, int));
-static FTSENT	*fts_build __P((FTS *, int));
-static void	 fts_lfree __P((FTSENT *));
-static void	 fts_load __P((FTS *, FTSENT *));
-static size_t	 fts_maxarglen __P((char * const *));
-static void	 fts_padjust __P((FTS *, FTSENT *));
-static int	 fts_palloc __P((FTS *, size_t));
-static FTSENT	*fts_sort __P((FTS *, FTSENT *, int));
-static u_short	 fts_stat __P((FTS *, FTSENT *, int));
-static int	 fts_safe_changedir __P((FTS *, FTSENT *, int, char *));
+static FTSENT	*fts_alloc (FTS *, char *, int);
+static FTSENT	*fts_build (FTS *, int);
+static void	 fts_lfree (FTSENT *);
+static void	 fts_load (FTS *, FTSENT *);
+static size_t	 fts_maxarglen (char * const *);
+static void	 fts_padjust (FTS *, FTSENT *);
+static int	 fts_palloc (FTS *, size_t);
+static FTSENT	*fts_sort (FTS *, FTSENT *, int);
+static u_short	 fts_stat (FTS *, FTSENT *, int);
+static int	 fts_safe_changedir (FTS *, FTSENT *, int, char *);
 
 #define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
 
@@ -78,7 +78,7 @@
 fts_open(argv, options, compar)
 	char * const *argv;
 	register int options;
-	int (*compar) __P((const FTSENT **, const FTSENT **));
+	int (*compar) (const FTSENT **, const FTSENT **);
 {
 	register FTS *sp;
 	register FTSENT *p, *root;
Index: lib/libcr/gen/getcap.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/getcap.c,v
retrieving revision 1.2
diff -u -r1.2 getcap.c
--- lib/libcr/gen/getcap.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/getcap.c	12 Nov 2003 17:19:01 -0000
@@ -65,9 +65,9 @@
 static char	*toprec;	/* Additional record specified by cgetset() */
 static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
 
-static int	cdbget __P((DB *, char **, char *));
-static int 	getent __P((char **, u_int *, char **, int, char *, int, char *));
-static int	nfcmp __P((char *, char *));
+static int	cdbget (DB *, char **, char *);
+static int 	getent (char **, u_int *, char **, int, char *, int, char *);
+static int	nfcmp (char *, char *);
 
 /*
  * Cgetset() allows the addition of a user specified buffer to be added
Index: lib/libcr/gen/getpwent.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/getpwent.c,v
retrieving revision 1.2
diff -u -r1.2 getpwent.c
--- lib/libcr/gen/getpwent.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/getpwent.c	12 Nov 2003 17:19:01 -0000
@@ -49,9 +49,9 @@
 #include <limits.h>
 #include <grp.h>
 
-extern void setnetgrent __P(( char * ));
-extern int getnetgrent __P(( char **, char **, char ** ));
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
+extern void setnetgrent ( char * );
+extern int getnetgrent ( char **, char **, char ** );
+extern int innetgr ( const char *, const char *, const char *, const char * );
 
 /*
  * The lookup techniques and data extraction code here must be kept
@@ -79,16 +79,16 @@
 #define YP_HAVE_NONE 0
 static int _gotmaster;
 static char *_pw_yp_domain;
-static inline int unwind __P(( char * ));
-static void _ypinitdb __P(( void ));
-static int _havemaster __P((char *));
-static int _getyppass __P((struct passwd *, const char *, const char * ));
-static int _nextyppass __P((struct passwd *));
-static inline int lookup __P((const char *));
-static inline void store __P((const char *));
-static inline int ingr __P((const char *, const char*));
-static inline int verf __P((const char *));
-static char * _get_adjunct_pw __P((const char *));
+static inline int unwind ( char * );
+static void _ypinitdb ( void );
+static int _havemaster (char *);
+static int _getyppass (struct passwd *, const char *, const char * );
+static int _nextyppass (struct passwd *);
+static inline int lookup (const char *);
+static inline void store (const char *);
+static inline int ingr (const char *, const char*);
+static inline int verf (const char *);
+static char * _get_adjunct_pw (const char *);
 #endif
 static int __hashpw(DBT *);
 static int __initdb(void);
Index: lib/libcr/gen/getttyent.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/getttyent.c,v
retrieving revision 1.2
diff -u -r1.2 getttyent.c
--- lib/libcr/gen/getttyent.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/getttyent.c	12 Nov 2003 17:19:01 -0000
@@ -49,8 +49,8 @@
 
 #define	MALLOCCHUNK	100
 
-static char *skip __P((char *));
-static char *value __P((char *));
+static char *skip (char *);
+static char *value (char *);
 
 struct ttyent *
 getttynam(tty)
Index: lib/libcr/gen/getusershell.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/getusershell.c,v
retrieving revision 1.2
diff -u -r1.2 getusershell.c
--- lib/libcr/gen/getusershell.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/getusershell.c	12 Nov 2003 17:19:01 -0000
@@ -54,7 +54,7 @@
 
 static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
 static char **curshell, **shells, *strings;
-static char **initshells __P((void));
+static char **initshells (void);
 
 /*
  * Get a list of shells from _PATH_SHELLS, if it exists.
Index: lib/libcr/gen/nlist.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/nlist.c,v
retrieving revision 1.2
diff -u -r1.2 nlist.c
--- lib/libcr/gen/nlist.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/nlist.c	12 Nov 2003 17:19:01 -0000
@@ -55,9 +55,9 @@
 #include <elf-hints.h>
 #endif
 
-int __fdnlist		__P((int, struct nlist *));
-int __aout_fdnlist	__P((int, struct nlist *));
-int __elf_fdnlist	__P((int, struct nlist *));
+int __fdnlist		(int, struct nlist *);
+int __aout_fdnlist	(int, struct nlist *);
+int __elf_fdnlist	(int, struct nlist *);
 
 int
 nlist(name, list)
@@ -75,7 +75,7 @@
 }
 
 static struct nlist_handlers {
-	int	(*fn) __P((int fd, struct nlist *list));
+	int	(*fn) (int fd, struct nlist *list);
 } nlist_fn[] = {
 #ifdef _NLIST_DO_AOUT
 	{ __aout_fdnlist },
@@ -199,7 +199,7 @@
 #endif
 
 #ifdef _NLIST_DO_ELF
-static void elf_sym_to_nlist __P((struct nlist *, Elf_Sym *, Elf_Shdr *, int));
+static void elf_sym_to_nlist (struct nlist *, Elf_Sym *, Elf_Shdr *, int);
 
 /*
  * __elf_is_okay__ - Determine if ehdr really
Index: lib/libcr/gen/rand48.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/rand48.h,v
retrieving revision 1.1
diff -u -r1.1 rand48.h
--- lib/libcr/gen/rand48.h	17 Jun 2003 02:50:47 -0000	1.1
+++ lib/libcr/gen/rand48.h	12 Nov 2003 17:19:01 -0000
@@ -17,7 +17,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-void		_dorand48 __P((unsigned short[3]));
+void		_dorand48 (unsigned short[3]);
 
 #define	RAND48_SEED_0	(0x330e)
 #define	RAND48_SEED_1	(0xabcd)
Index: lib/libcr/gen/rewinddir.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/rewinddir.c,v
retrieving revision 1.2
diff -u -r1.2 rewinddir.c
--- lib/libcr/gen/rewinddir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/rewinddir.c	12 Nov 2003 17:19:01 -0000
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-extern void _seekdir __P(( DIR *, long ));
+extern void _seekdir ( DIR *, long );
 
 void
 rewinddir(dirp)
Index: lib/libcr/gen/scandir.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/scandir.c,v
retrieving revision 1.2
diff -u -r1.2 scandir.c
--- lib/libcr/gen/scandir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/scandir.c	12 Nov 2003 17:19:01 -0000
@@ -64,8 +64,8 @@
 scandir(dirname, namelist, select, dcomp)
 	const char *dirname;
 	struct dirent ***namelist;
-	int (*select) __P((struct dirent *));
-	int (*dcomp) __P((const void *, const void *));
+	int (*select) (struct dirent *);
+	int (*dcomp) (const void *, const void *);
 {
 	register struct dirent *d, *p, **names = NULL;
 	register size_t nitems = 0;
Index: lib/libcr/gen/seekdir.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/seekdir.c,v
retrieving revision 1.2
diff -u -r1.2 seekdir.c
--- lib/libcr/gen/seekdir.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/seekdir.c	12 Nov 2003 17:19:01 -0000
@@ -39,7 +39,7 @@
 #include <sys/param.h>
 #include <dirent.h>
 
-extern void _seekdir __P(( DIR *, long ));
+extern void _seekdir ( DIR *, long );
 
 /*
  * Seek to an entry in a directory.
Index: lib/libcr/gen/setmode.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/setmode.c,v
retrieving revision 1.2
diff -u -r1.2 setmode.c
--- lib/libcr/gen/setmode.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/setmode.c	12 Nov 2003 17:19:01 -0000
@@ -65,10 +65,10 @@
 #define	CMD2_OBITS	0x08
 #define	CMD2_UBITS	0x10
 
-static BITCMD	*addcmd __P((BITCMD *, int, int, int, u_int));
-static void	 compress_mode __P((BITCMD *));
+static BITCMD	*addcmd (BITCMD *, int, int, int, u_int);
+static void	 compress_mode (BITCMD *);
 #ifdef SETMODE_DEBUG
-static void	 dumpmode __P((BITCMD *));
+static void	 dumpmode (BITCMD *);
 #endif
 
 /*
Index: lib/libcr/gen/syslog.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/syslog.c,v
retrieving revision 1.2
diff -u -r1.2 syslog.c
--- lib/libcr/gen/syslog.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/syslog.c	12 Nov 2003 17:19:01 -0000
@@ -65,8 +65,8 @@
 static int	LogMask = 0xff;		/* mask of priorities to be logged */
 extern char	*__progname;		/* Program name, from crt0. */
 
-static void	disconnectlog __P((void)); /* disconnect from syslogd */
-static void	connectlog __P((void));	/* (re)connect to syslogd */
+static void	disconnectlog (void); /* disconnect from syslogd */
+static void	connectlog (void);	/* (re)connect to syslogd */
 
 /*
  * Format of the magic cookie passed through the stdio hook
Index: lib/libcr/gen/ttyname.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gen/ttyname.c,v
retrieving revision 1.2
diff -u -r1.2 ttyname.c
--- lib/libcr/gen/ttyname.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gen/ttyname.c	12 Nov 2003 17:19:01 -0000
@@ -155,7 +155,7 @@
 }
 #else
 static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
-static char *oldttyname __P((int, struct stat *));
+static char *oldttyname (int, struct stat *);
 
 char *
 ttyname(fd)
Index: lib/libcr/gmon/gmon.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gmon/gmon.c,v
retrieving revision 1.2
diff -u -r1.2 gmon.c
--- lib/libcr/gmon/gmon.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gmon/gmon.c	12 Nov 2003 17:19:01 -0000
@@ -63,8 +63,8 @@
 
 #define ERR(s) _write(2, s, sizeof(s))
 
-void	moncontrol __P((int));
-static int hertz __P((void));
+void	moncontrol (int);
+static int hertz (void);
 
 void
 monstartup(lowpc, highpc)
Index: lib/libcr/gmon/mcount.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/gmon/mcount.c,v
retrieving revision 1.2
diff -u -r1.2 mcount.c
--- lib/libcr/gmon/mcount.c	17 Jun 2003 04:26:42 -0000	1.2
+++ lib/libcr/gmon/mcount.c	12 Nov 2003 17:19:01 -0000
@@ -42,10 +42,10 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-void	bintr __P((void));
-void	btrap __P((void));
-void	eintr __P((void));
-void	user __P((void));
+void	bintr (void);
+void	btrap (void);
+void	eintr (void);
+void	user (void);
 #endif
 
 /*
Index: lib/libcr/include/spinlock.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/include/spinlock.h,v
retrieving revision 1.2
diff -u -r1.2 spinlock.h
--- lib/libcr/include/spinlock.h	17 Jun 2003 04:26:43 -0000	1.2
+++ lib/libcr/include/spinlock.h	12 Nov 2003 17:19:02 -0000
@@ -64,9 +64,9 @@
  * Thread function prototype definitions:
  */
 __BEGIN_DECLS
-long	_atomic_lock __P((volatile long *));
-void	_spinlock __P((spinlock_t *));
-void	_spinlock_debug __P((spinlock_t *, char *, int));
+long	_atomic_lock (volatile long *);
+void	_spinlock (spinlock_t *);
+void	_spinlock_debug (spinlock_t *, char *, int);
 __END_DECLS
 
 #endif /* _SPINLOCK_H_ */
Index: lib/libcr/locale/big5.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/locale/big5.c,v
retrieving revision 1.2
diff -u -r1.2 big5.c
--- lib/libcr/locale/big5.c	17 Jun 2003 04:26:43 -0000	1.2
+++ lib/libcr/locale/big5.c	12 Nov 2003 17:19:02 -0000
@@ -45,8 +45,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-rune_t	_BIG5_sgetrune __P((const char *, size_t, char const **));
-int	_BIG5_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_BIG5_sgetrune (const char *, size_t, char const **);
+int	_BIG5_sputrune (rune_t, char *, size_t, char **);
 
 int
 _BIG5_init(rl)
Index: lib/libcr/locale/mskanji.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/locale/mskanji.c,v
retrieving revision 1.2
diff -u -r1.2 mskanji.c
--- lib/libcr/locale/mskanji.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/locale/mskanji.c	12 Nov 2003 17:19:02 -0000
@@ -43,8 +43,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-rune_t	_MSKanji_sgetrune __P((const char *, size_t, char const **));
-int	_MSKanji_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_MSKanji_sgetrune (const char *, size_t, char const **);
+int	_MSKanji_sputrune (rune_t, char *, size_t, char **);
 
 int
 _MSKanji_init(rl)
Index: lib/libcr/locale/none.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/locale/none.c,v
retrieving revision 1.2
diff -u -r1.2 none.c
--- lib/libcr/locale/none.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/locale/none.c	12 Nov 2003 17:19:02 -0000
@@ -44,8 +44,8 @@
 #include <rune.h>
 #include <stdlib.h>
 
-rune_t	_none_sgetrune __P((const char *, size_t, char const **));
-int	_none_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_none_sgetrune (const char *, size_t, char const **);
+int	_none_sputrune (rune_t, char *, size_t, char **);
 
 int
 _none_init(rl)
Index: lib/libcr/locale/table.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/locale/table.c,v
retrieving revision 1.2
diff -u -r1.2 table.c
--- lib/libcr/locale/table.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/locale/table.c	12 Nov 2003 17:19:02 -0000
@@ -42,9 +42,9 @@
 #include <ctype.h>
 #include <rune.h>
 
-extern rune_t	_none_sgetrune __P((const char *, size_t, char const **));
-extern int	_none_sputrune __P((rune_t, char *, size_t, char **));
-extern int	_none_init __P((char *, char **));
+extern rune_t	_none_sgetrune (const char *, size_t, char const **);
+extern int	_none_sputrune (rune_t, char *, size_t, char **);
+extern int	_none_init (char *, char **);
 
 _RuneLocale _DefaultRuneLocale = {
     _RUNE_MAGIC_1,
Index: lib/libcr/locale/utf2.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/locale/utf2.c,v
retrieving revision 1.2
diff -u -r1.2 utf2.c
--- lib/libcr/locale/utf2.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/locale/utf2.c	12 Nov 2003 17:19:02 -0000
@@ -44,8 +44,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-rune_t	_UTF2_sgetrune __P((const char *, size_t, char const **));
-int	_UTF2_sputrune __P((rune_t, char *, size_t, char **));
+rune_t	_UTF2_sgetrune (const char *, size_t, char const **);
+int	_UTF2_sputrune (rune_t, char *, size_t, char **);
 
 static int _utf_count[16] = {
 	1, 1, 1, 1, 1, 1, 1, 1,
Index: lib/libcr/net/getaddrinfo.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/getaddrinfo.c,v
retrieving revision 1.2
diff -u -r1.2 getaddrinfo.c
--- lib/libcr/net/getaddrinfo.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/getaddrinfo.c	12 Nov 2003 17:19:02 -0000
@@ -184,43 +184,43 @@
 	int n;			/* result length */
 };
 
-static int str_isnumber __P((const char *));
-static int explore_fqdn __P((const struct addrinfo *, const char *,
+static int str_isnumber (const char *);
+static int explore_fqdn (const struct addrinfo *, const char *,
 	const char *, struct addrinfo **));
-static int explore_null __P((const struct addrinfo *,
+static int explore_null (const struct addrinfo *,
 	const char *, struct addrinfo **));
-static int explore_numeric __P((const struct addrinfo *, const char *,
+static int explore_numeric (const struct addrinfo *, const char *,
 	const char *, struct addrinfo **));
-static int explore_numeric_scope __P((const struct addrinfo *, const char *,
+static int explore_numeric_scope (const struct addrinfo *, const char *,
 	const char *, struct addrinfo **));
-static int get_canonname __P((const struct addrinfo *,
+static int get_canonname (const struct addrinfo *,
 	struct addrinfo *, const char *));
-static struct addrinfo *get_ai __P((const struct addrinfo *,
+static struct addrinfo *get_ai (const struct addrinfo *,
 	const struct afd *, const char *));
-static int get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
-static int addrconfig __P((struct addrinfo *));
+static int get_portmatch (const struct addrinfo *, const char *);
+static int get_port (struct addrinfo *, const char *, int);
+static const struct afd *find_afd (int);
+static int addrconfig (struct addrinfo *);
 #ifdef INET6
-static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *, u_int32_t *));
+static int ip6_str2scopeid (char *, struct sockaddr_in6 *, u_int32_t *);
 #endif
 
-static struct addrinfo *getanswer __P((const querybuf *, int, const char *,
+static struct addrinfo *getanswer (const querybuf *, int, const char *,
 	int, const struct addrinfo *));
-static int _dns_getaddrinfo __P((const struct addrinfo *, const char *,
+static int _dns_getaddrinfo (const struct addrinfo *, const char *,
 	struct addrinfo **));
-static struct addrinfo *_gethtent __P((FILE *fp, const char *,
+static struct addrinfo *_gethtent (FILE *fp, const char *,
 	const struct addrinfo *));
-static int _files_getaddrinfo __P((const struct addrinfo *, const char *,
+static int _files_getaddrinfo (const struct addrinfo *, const char *,
 	struct addrinfo **));
 #ifdef YP
-static int _nis_getaddrinfo __P((const struct addrinfo *, const char *,
+static int _nis_getaddrinfo (const struct addrinfo *, const char *,
 	struct addrinfo **));
 #endif
 
-static int res_queryN __P((const char *, struct res_target *));
-static int res_searchN __P((const char *, struct res_target *));
-static int res_querydomainN __P((const char *, const char *,
+static int res_queryN (const char *, struct res_target *);
+static int res_searchN (const char *, struct res_target *);
+static int res_querydomainN (const char *, const char *,
 	struct res_target *));
 
 static char *ai_errlist[] = {
@@ -1295,7 +1295,7 @@
 	int type, class, ancount, qdcount;
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 	char hostbuf[8*1024];
 
 	memset(&sentinel, 0, sizeof(sentinel));
@@ -1759,7 +1759,7 @@
 
 /* resolver logic */
 
-extern const char *__hostalias __P((const char *));
+extern const char *__hostalias (const char *);
 extern int h_errno;
 
 /*
Index: lib/libcr/net/gethostbydns.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/gethostbydns.c,v
retrieving revision 1.2
diff -u -r1.2 gethostbydns.c
--- lib/libcr/net/gethostbydns.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/gethostbydns.c	12 Nov 2003 17:19:02 -0000
@@ -93,7 +93,7 @@
 static u_char host_addr[16];	/* IPv4 or IPv6 */
 
 #ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort (char **, int);
 #endif
 
 #define MAXPACKET	(64*1024)
@@ -162,7 +162,7 @@
 	int toobig = 0;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 
 	tname = qname;
 	host.h_name = NULL;
Index: lib/libcr/net/getnameinfo.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/getnameinfo.c,v
retrieving revision 1.2
diff -u -r1.2 getnameinfo.c
--- lib/libcr/net/getnameinfo.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/getnameinfo.c	12 Nov 2003 17:19:03 -0000
@@ -79,9 +79,9 @@
 };
 
 #ifdef INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
+static int ip6_parsenumeric (const struct sockaddr *, const char *, char *,
     size_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
+static int ip6_sa2str (const struct sockaddr_in6 *, char *, size_t, int);
 #endif
 
 int
Index: lib/libcr/net/getservent.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/getservent.c,v
retrieving revision 1.2
diff -u -r1.2 getservent.c
--- lib/libcr/net/getservent.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/getservent.c	12 Nov 2003 17:19:03 -0000
@@ -44,7 +44,7 @@
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
+extern int _yp_check ( char ** );
 #endif
 
 
Index: lib/libcr/net/inet_net_ntop.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/inet_net_ntop.c,v
retrieving revision 1.2
diff -u -r1.2 inet_net_ntop.c
--- lib/libcr/net/inet_net_ntop.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/inet_net_ntop.c	12 Nov 2003 17:19:03 -0000
@@ -34,7 +34,7 @@
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
+static char *	inet_net_ntop_ipv4 (const u_char *src, int bits,
 					char *dst, size_t size));
 
 /*
Index: lib/libcr/net/inet_net_pton.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/inet_net_pton.c,v
retrieving revision 1.2
diff -u -r1.2 inet_net_pton.c
--- lib/libcr/net/inet_net_pton.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/inet_net_pton.c	12 Nov 2003 17:19:03 -0000
@@ -37,7 +37,7 @@
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
+static int	inet_net_pton_ipv4 (const char *src, u_char *dst,
 
 /*
Index: lib/libcr/net/inet_ntop.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/inet_ntop.c,v
retrieving revision 1.2
diff -u -r1.2 inet_ntop.c
--- lib/libcr/net/inet_ntop.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/inet_ntop.c	12 Nov 2003 17:19:03 -0000
@@ -32,8 +32,8 @@
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop4 (const u_char *src, char *dst, size_t size);
+static const char *inet_ntop6 (const u_char *src, char *dst, size_t size);
 
 /* char *
  * inet_ntop(af, src, dst, size)
Index: lib/libcr/net/inet_pton.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/inet_pton.c,v
retrieving revision 1.2
diff -u -r1.2 inet_pton.c
--- lib/libcr/net/inet_pton.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/inet_pton.c	12 Nov 2003 17:19:03 -0000
@@ -33,8 +33,8 @@
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
+static int	inet_pton4 (const char *src, u_char *dst);
+static int	inet_pton6 (const char *src, u_char *dst);
 
 /* int
  * inet_pton(af, src, dst)
Index: lib/libcr/net/name6.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/name6.c,v
retrieving revision 1.2
diff -u -r1.2 name6.c
--- lib/libcr/net/name6.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/name6.c	12 Nov 2003 17:19:03 -0000
@@ -1025,7 +1025,7 @@
 	u_char buf[MAXPACKET];
 } querybuf;
 
-static struct hostent *getanswer __P((const querybuf *, int, const char *,
+static struct hostent *getanswer (const querybuf *, int, const char *,
 	int, struct hostent *, int *));
 
 /*
@@ -1049,7 +1049,7 @@
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok) (const char *);
 	static char *h_addr_ptrs[MAXADDRS + 1];
 	static char *host_aliases[MAXALIASES];
 	static char hostbuf[8*1024];
Index: lib/libcr/net/rcmd.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/rcmd.c,v
retrieving revision 1.2
diff -u -r1.2 rcmd.c
--- lib/libcr/net/rcmd.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/rcmd.c	12 Nov 2003 17:19:03 -0000
@@ -65,16 +65,16 @@
 #define NI_WITHSCOPEID	0
 #endif
 
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
+extern int innetgr ( const char *, const char *, const char *, const char * );
 
 #define max(a, b)	((a > b) ? a : b)
 
-int	__ivaliduser __P((FILE *, u_int32_t, const char *, const char *));
-int __ivaliduser_af __P((FILE *,const void *, const char *, const char *,
+int	__ivaliduser (FILE *, u_int32_t, const char *, const char *);
+int __ivaliduser_af (FILE *,const void *, const char *, const char *,
 	int, int));
-int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t,
+int __ivaliduser_sa (FILE *, const struct sockaddr *, socklen_t,
 	const char *,const char *));
-static int __icheckhost __P((const struct sockaddr *, socklen_t,
+static int __icheckhost (const struct sockaddr *, socklen_t,
 	const char *));
 
 char paddr[NI_MAXHOST];
Index: lib/libcr/net/res_init.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/res_init.c,v
retrieving revision 1.2
diff -u -r1.2 res_init.c
--- lib/libcr/net/res_init.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/res_init.c	12 Nov 2003 17:19:03 -0000
@@ -90,12 +90,12 @@
 
 #include "res_config.h"
 
-static void res_setoptions __P((char *, char *));
+static void res_setoptions (char *, char *);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask (struct in_addr);
 #endif
 
 #if !defined(isascii) /* XXX - could be a function */
Index: lib/libcr/net/res_send.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/net/res_send.c,v
retrieving revision 1.2
diff -u -r1.2 res_send.c
--- lib/libcr/net/res_send.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/net/res_send.c	12 Nov 2003 17:19:03 -0000
@@ -121,8 +121,8 @@
 		} else {}
 static char abuf[NI_MAXHOST];
 static char pbuf[NI_MAXSERV];
-static void Aerror __P((FILE *, char *, int, struct sockaddr *));
-static void Perror __P((FILE *, char *, int));
+static void Aerror (FILE *, char *, int, struct sockaddr *);
+static void Perror (FILE *, char *, int);
 
     static void
     Aerror(file, string, error, address)
@@ -177,7 +177,7 @@
 	Rhook = hook;
 }
 
-static struct sockaddr * get_nsaddr __P((size_t));
+static struct sockaddr * get_nsaddr (size_t);
 
 /*
  * pick appropriate nsaddr_list for use.  see res_init() for initialization.
Index: lib/libcr/quad/quad.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/quad/quad.h,v
retrieving revision 1.2
diff -u -r1.2 quad.h
--- lib/libcr/quad/quad.h	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/quad/quad.h	12 Nov 2003 17:19:03 -0000
@@ -97,11 +97,11 @@
 #define	LHALF(x)	((x) & ((1 << HALF_BITS) - 1))
 #define	LHUP(x)		((x) << HALF_BITS)
 
-quad_t		__divdi3 __P((quad_t a, quad_t b));
-quad_t		__moddi3 __P((quad_t a, quad_t b));
-u_quad_t	__qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem));
-u_quad_t	__udivdi3 __P((u_quad_t a, u_quad_t b));
-u_quad_t	__umoddi3 __P((u_quad_t a, u_quad_t b));
+quad_t		__divdi3 (quad_t a, quad_t b);
+quad_t		__moddi3 (quad_t a, quad_t b);
+u_quad_t	__qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem);
+u_quad_t	__udivdi3 (u_quad_t a, u_quad_t b);
+u_quad_t	__umoddi3 (u_quad_t a, u_quad_t b);
 
 /*
  * XXX
Index: lib/libcr/regex/engine.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/regex/engine.c,v
retrieving revision 1.2
diff -u -r1.2 engine.c
--- lib/libcr/regex/engine.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/regex/engine.c	12 Nov 2003 17:19:03 -0000
@@ -93,12 +93,12 @@
 #endif
 
 /* === engine.c === */
-static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags));
-static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev));
-static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft));
+static int matcher (struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
+static char *dissect (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *backref (struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
+static char *fast (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *slow (struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static states step (struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
 #define	BOL	(OUT+1)
 #define	EOL	(BOL+1)
 #define	BOLEOL	(BOL+2)
@@ -109,13 +109,13 @@
 #define	NONCHAR(c)	((c) > CHAR_MAX)
 #define	NNONCHAR	(CODEMAX-CHAR_MAX)
 #ifdef REDEBUG
-static void print __P((struct match *m, char *caption, states st, int ch, FILE *d));
+static void print (struct match *m, char *caption, states st, int ch, FILE *d);
 #endif
 #ifdef REDEBUG
-static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst));
+static void at (struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
 #endif
 #ifdef REDEBUG
-static char *pchar __P((int ch));
+static char *pchar (int ch);
 #endif
 
 #ifdef __cplusplus
Index: lib/libcr/regex/regcomp.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/regex/regcomp.c,v
retrieving revision 1.2
diff -u -r1.2 regcomp.c
--- lib/libcr/regex/regcomp.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/regex/regcomp.c	12 Nov 2003 17:19:03 -0000
@@ -82,51 +82,51 @@
 #endif
 
 /* === regcomp.c === */
-static void p_ere __P((struct parse *p, int stop));
-static void p_ere_exp __P((struct parse *p));
-static void p_str __P((struct parse *p));
-static void p_bre __P((struct parse *p, int end1, int end2));
-static int p_simp_re __P((struct parse *p, int starordinary));
-static int p_count __P((struct parse *p));
-static void p_bracket __P((struct parse *p));
-static void p_b_term __P((struct parse *p, cset *cs));
-static void p_b_cclass __P((struct parse *p, cset *cs));
-static void p_b_eclass __P((struct parse *p, cset *cs));
-static char p_b_symbol __P((struct parse *p));
-static char p_b_coll_elem __P((struct parse *p, int endc));
-static char othercase __P((int ch));
-static void bothcases __P((struct parse *p, int ch));
-static void ordinary __P((struct parse *p, int ch));
-static void nonnewline __P((struct parse *p));
-static void repeat __P((struct parse *p, sopno start, int from, int to));
-static int seterr __P((struct parse *p, int e));
-static cset *allocset __P((struct parse *p));
-static void freeset __P((struct parse *p, cset *cs));
-static int freezeset __P((struct parse *p, cset *cs));
-static int firstch __P((struct parse *p, cset *cs));
-static int nch __P((struct parse *p, cset *cs));
-static void mcadd __P((struct parse *p, cset *cs, char *cp));
+static void p_ere (struct parse *p, int stop);
+static void p_ere_exp (struct parse *p);
+static void p_str (struct parse *p);
+static void p_bre (struct parse *p, int end1, int end2);
+static int p_simp_re (struct parse *p, int starordinary);
+static int p_count (struct parse *p);
+static void p_bracket (struct parse *p);
+static void p_b_term (struct parse *p, cset *cs);
+static void p_b_cclass (struct parse *p, cset *cs);
+static void p_b_eclass (struct parse *p, cset *cs);
+static char p_b_symbol (struct parse *p);
+static char p_b_coll_elem (struct parse *p, int endc);
+static char othercase (int ch);
+static void bothcases (struct parse *p, int ch);
+static void ordinary (struct parse *p, int ch);
+static void nonnewline (struct parse *p);
+static void repeat (struct parse *p, sopno start, int from, int to);
+static int seterr (struct parse *p, int e);
+static cset *allocset (struct parse *p);
+static void freeset (struct parse *p, cset *cs);
+static int freezeset (struct parse *p, cset *cs);
+static int firstch (struct parse *p, cset *cs);
+static int nch (struct parse *p, cset *cs);
+static void mcadd (struct parse *p, cset *cs, char *cp);
 #if used
-static void mcsub __P((cset *cs, char *cp));
-static int mcin __P((cset *cs, char *cp));
-static char *mcfind __P((cset *cs, char *cp));
+static void mcsub (cset *cs, char *cp);
+static int mcin (cset *cs, char *cp);
+static char *mcfind (cset *cs, char *cp);
 #endif
-static void mcinvert __P((struct parse *p, cset *cs));
-static void mccase __P((struct parse *p, cset *cs));
-static int isinsets __P((struct re_guts *g, int c));
-static int samesets __P((struct re_guts *g, int c1, int c2));
-static void categorize __P((struct parse *p, struct re_guts *g));
-static sopno dupl __P((struct parse *p, sopno start, sopno finish));
-static void doemit __P((struct parse *p, sop op, size_t opnd));
-static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos));
-static void dofwd __P((struct parse *p, sopno pos, sop value));
-static void enlarge __P((struct parse *p, sopno size));
-static void stripsnug __P((struct parse *p, struct re_guts *g));
-static void findmust __P((struct parse *p, struct re_guts *g));
-static int altoffset __P((sop *scan, int offset, int mccs));
-static void computejumps __P((struct parse *p, struct re_guts *g));
-static void computematchjumps __P((struct parse *p, struct re_guts *g));
-static sopno pluscount __P((struct parse *p, struct re_guts *g));
+static void mcinvert (struct parse *p, cset *cs);
+static void mccase (struct parse *p, cset *cs);
+static int isinsets (struct re_guts *g, int c);
+static int samesets (struct re_guts *g, int c1, int c2);
+static void categorize (struct parse *p, struct re_guts *g);
+static sopno dupl (struct parse *p, sopno start, sopno finish);
+static void doemit (struct parse *p, sop op, size_t opnd);
+static void doinsert (struct parse *p, sop op, size_t opnd, sopno pos);
+static void dofwd (struct parse *p, sopno pos, sop value);
+static void enlarge (struct parse *p, sopno size);
+static void stripsnug (struct parse *p, struct re_guts *g);
+static void findmust (struct parse *p, struct re_guts *g);
+static int altoffset (sop *scan, int offset, int mccs);
+static void computejumps (struct parse *p, struct re_guts *g);
+static void computematchjumps (struct parse *p, struct re_guts *g);
+static sopno pluscount (struct parse *p, struct re_guts *g);
 
 #ifdef __cplusplus
 }
Index: lib/libcr/regex/regerror.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/regex/regerror.c,v
retrieving revision 1.2
diff -u -r1.2 regerror.c
--- lib/libcr/regex/regerror.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/regex/regerror.c	12 Nov 2003 17:19:03 -0000
@@ -54,7 +54,7 @@
 #endif
 
 /* === regerror.c === */
-static char *regatoi __P((const regex_t *preg, char *localbuf));
+static char *regatoi (const regex_t *preg, char *localbuf);
 
 #ifdef __cplusplus
 }
Index: lib/libcr/rpc/auth_des.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/auth_des.c,v
retrieving revision 1.2
diff -u -r1.2 auth_des.c
--- lib/libcr/rpc/auth_des.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/rpc/auth_des.c	12 Nov 2003 17:19:04 -0000
@@ -50,11 +50,11 @@
 #undef NIS
 #include <rpcsvc/nis.h>
 
-extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *,
+extern bool_t __rpc_get_time_offset ( struct timeval *, nis_server *,
 						char *, char **, struct sockaddr_in * ));
-extern int rtime __P(( struct sockaddr_in *, struct timeval *, struct timeval *));
-extern bool_t xdr_authdes_cred __P(( XDR *, struct authdes_cred * ));
-extern bool_t xdr_authdes_verf __P(( XDR *, struct authdes_verf * ));
+extern int rtime ( struct sockaddr_in *, struct timeval *, struct timeval *);
+extern bool_t xdr_authdes_cred ( XDR *, struct authdes_cred * );
+extern bool_t xdr_authdes_verf ( XDR *, struct authdes_verf * );
 
 #define MILLION		1000000L
 #define RTIME_TIMEOUT 5		/* seconds to wait for sync */
@@ -82,7 +82,7 @@
 	authdes_destroy
 };
 #ifdef foo
-static bool_t	synchronize __P(( struct sockaddr *, struct timeval *));
+static bool_t	synchronize ( struct sockaddr *, struct timeval *);
 #endif
 /*
  * This struct is pointed to by the ah_private field of an "AUTH *"
Index: lib/libcr/rpc/des_crypt.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/des_crypt.c,v
retrieving revision 1.2
diff -u -r1.2 des_crypt.c
--- lib/libcr/rpc/des_crypt.c	17 Jun 2003 04:26:44 -0000	1.2
+++ lib/libcr/rpc/des_crypt.c	12 Nov 2003 17:19:04 -0000
@@ -39,9 +39,9 @@
 #include <rpc/des_crypt.h>
 #include <rpc/des.h>
 
-static int common_crypt	__P(( char *, char *, register unsigned, unsigned, struct desparams * ));
+static int common_crypt	( char *, char *, register unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
-extern _des_crypt_call __P(( char *, int, struct desparams * ));
+extern _des_crypt_call ( char *, int, struct desparams * );
 /*
  * Copy 8 bytes
  */
Index: lib/libcr/rpc/key_call.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/key_call.c,v
retrieving revision 1.2
diff -u -r1.2 key_call.c
--- lib/libcr/rpc/key_call.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libcr/rpc/key_call.c	12 Nov 2003 17:19:04 -0000
@@ -82,7 +82,7 @@
 cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
 des_block *(*__key_gendes_LOCAL)() = 0;
 
-static int key_call __P(( u_long, xdrproc_t, char *, xdrproc_t, char * ));
+static int key_call ( u_long, xdrproc_t, char *, xdrproc_t, char * );
 
 int
 key_setsecret(secretkey)
Index: lib/libcr/rpc/netnamer.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/netnamer.c,v
retrieving revision 1.2
diff -u -r1.2 netnamer.c
--- lib/libcr/rpc/netnamer.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libcr/rpc/netnamer.c	12 Nov 2003 17:19:04 -0000
@@ -57,8 +57,8 @@
 static char    *NETID = "netid.byname";
 static char    *NETIDFILE = "/etc/netid";
 
-static int getnetid __P(( char *, char * ));
-static int _getgroups __P(( char *, gid_t * ));
+static int getnetid ( char *, char * );
+static int _getgroups ( char *, gid_t * );
 
 #ifndef NGROUPS
 #define NGROUPS 16
Index: lib/libcr/rpc/rtime.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/rtime.c,v
retrieving revision 1.2
diff -u -r1.2 rtime.c
--- lib/libcr/rpc/rtime.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libcr/rpc/rtime.c	12 Nov 2003 17:19:04 -0000
@@ -56,12 +56,12 @@
 #include <stdio.h>
 #include <netdb.h>
 
-extern int _rpc_dtablesize __P(( void ));
+extern int _rpc_dtablesize ( void );
 
 #define NYEARS	(unsigned long)(1970 - 1900)
 #define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
 
-static void do_close __P(( int ));
+static void do_close ( int );
 
 int
 rtime(addrp, timep, timeout)
Index: lib/libcr/rpc/svc_udp.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/rpc/svc_udp.c,v
retrieving revision 1.2
diff -u -r1.2 svc_udp.c
--- lib/libcr/rpc/svc_udp.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libcr/rpc/svc_udp.c	12 Nov 2003 17:19:04 -0000
@@ -57,8 +57,8 @@
 static bool_t		svcudp_getargs();
 static bool_t		svcudp_freeargs();
 static void		svcudp_destroy();
-static void		cache_set __P((SVCXPRT *, u_long));
-static int		cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *));
+static void		cache_set (SVCXPRT *, u_long);
+static int		cache_get (SVCXPRT *, struct rpc_msg *, char **, u_long *);
 
 static struct xp_ops svcudp_op = {
 	svcudp_recv,
Index: lib/libcr/stdio/findfp.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/findfp.c,v
retrieving revision 1.2
diff -u -r1.2 findfp.c
--- lib/libcr/stdio/findfp.c	17 Jun 2003 04:26:45 -0000	1.2
+++ lib/libcr/stdio/findfp.c	12 Nov 2003 17:19:04 -0000
@@ -81,7 +81,7 @@
 FILE *__stdoutp = &__sF[1];
 FILE *__stderrp = &__sF[2];
 
-static struct glue *	moreglue __P((int));
+static struct glue *	moreglue (int);
 
 static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
 #define THREAD_LOCK()	if (__isthreaded) _SPINLOCK(&thread_lock)
Index: lib/libcr/stdio/fseek.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/fseek.c,v
retrieving revision 1.2
diff -u -r1.2 fseek.c
--- lib/libcr/stdio/fseek.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/fseek.c	12 Nov 2003 17:19:04 -0000
@@ -68,7 +68,7 @@
 	off_t offset;
 	int whence;
 {
-	register fpos_t (*seekfn) __P((void *, fpos_t, int));
+	register fpos_t (*seekfn) (void *, fpos_t, int);
 	fpos_t target, curoff;
 	size_t n;
 	struct stat st;
Index: lib/libcr/stdio/local.h
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/local.h,v
retrieving revision 1.2
diff -u -r1.2 local.h
--- lib/libcr/stdio/local.h	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/local.h	12 Nov 2003 17:19:05 -0000
@@ -44,21 +44,21 @@
  * in particular, macros and private variables.
  */
 
-extern int	__sflush __P((FILE *));
-extern FILE	*__sfp __P((void));
-extern int	__srefill __P((FILE *));
-extern int	__sread __P((void *, char *, int));
-extern int	__swrite __P((void *, char const *, int));
-extern fpos_t	__sseek __P((void *, fpos_t, int));
-extern int	__sclose __P((void *));
-extern void	__sinit __P((void));
-extern void	_cleanup __P((void));
-extern void	(*__cleanup) __P((void));
-extern void	__smakebuf __P((FILE *));
-extern int	__swhatbuf __P((FILE *, size_t *, int *));
-extern int	_fwalk __P((int (*)(FILE *)));
-extern int	__swsetup __P((FILE *));
-extern int	__sflags __P((const char *, int *));
+extern int	__sflush (FILE *);
+extern FILE	*__sfp (void);
+extern int	__srefill (FILE *);
+extern int	__sread (void *, char *, int);
+extern int	__swrite (void *, char const *, int);
+extern fpos_t	__sseek (void *, fpos_t, int);
+extern int	__sclose (void *);
+extern void	__sinit (void);
+extern void	_cleanup (void);
+extern void	(*__cleanup) (void);
+extern void	__smakebuf (FILE *);
+extern int	__swhatbuf (FILE *, size_t *, int *);
+extern int	_fwalk (int (*)(FILE *));
+extern int	__swsetup (FILE *);
+extern int	__sflags (const char *, int *);
 
 extern int	__sdidinit;
 
Index: lib/libcr/stdio/mktemp.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/mktemp.c,v
retrieving revision 1.2
diff -u -r1.2 mktemp.c
--- lib/libcr/stdio/mktemp.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/mktemp.c	12 Nov 2003 17:19:05 -0000
@@ -45,9 +45,9 @@
 #include <ctype.h>
 #include <unistd.h>
 
-char *_mktemp __P((char *));
+char *_mktemp (char *);
 
-static int _gettemp __P((char *, int *, int, int));
+static int _gettemp (char *, int *, int, int);
 
 static const unsigned char padchar[] =
 "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
Index: lib/libcr/stdio/refill.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/refill.c,v
retrieving revision 1.2
diff -u -r1.2 refill.c
--- lib/libcr/stdio/refill.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/refill.c	12 Nov 2003 17:19:05 -0000
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include "local.h"
 
-static int lflush __P((FILE *));
+static int lflush (FILE *);
 
 static int
 lflush(FILE *fp)
Index: lib/libcr/stdio/sscanf.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/sscanf.c,v
retrieving revision 1.2
diff -u -r1.2 sscanf.c
--- lib/libcr/stdio/sscanf.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/sscanf.c	12 Nov 2003 17:19:05 -0000
@@ -47,7 +47,7 @@
 #endif
 #include "local.h"
 
-static int eofread __P((void *, char *, int));
+static int eofread (void *, char *, int);
 
 /* ARGSUSED */
 static int
Index: lib/libcr/stdio/tempnam.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/tempnam.c,v
retrieving revision 1.2
diff -u -r1.2 tempnam.c
--- lib/libcr/stdio/tempnam.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/tempnam.c	12 Nov 2003 17:19:05 -0000
@@ -46,7 +46,7 @@
 __warn_references(tempnam,
     "warning: tempnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp (char *);
 
 char *
 tempnam(dir, pfx)
Index: lib/libcr/stdio/tmpnam.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/tmpnam.c,v
retrieving revision 1.2
diff -u -r1.2 tmpnam.c
--- lib/libcr/stdio/tmpnam.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/tmpnam.c	12 Nov 2003 17:19:05 -0000
@@ -47,7 +47,7 @@
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp (char *);
 
 char *
 tmpnam(s)
Index: lib/libcr/stdio/ungetc.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/ungetc.c,v
retrieving revision 1.2
diff -u -r1.2 ungetc.c
--- lib/libcr/stdio/ungetc.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/ungetc.c	12 Nov 2003 17:19:05 -0000
@@ -44,7 +44,7 @@
 #include "local.h"
 #include "libc_private.h"
 
-static int __submore __P((FILE *));
+static int __submore (FILE *);
 
 /*
  * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
Index: lib/libcr/stdio/vfprintf.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/vfprintf.c,v
retrieving revision 1.2
diff -u -r1.2 vfprintf.c
--- lib/libcr/stdio/vfprintf.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdio/vfprintf.c	12 Nov 2003 17:19:05 -0000
@@ -64,12 +64,12 @@
 /* Define FLOATING_POINT to get floating point. */
 #define	FLOATING_POINT
 
-static int	__sprint __P((FILE *, struct __suio *));
-static int	__sbprintf __P((FILE *, const char *, va_list));
-static char *	__ultoa __P((u_long, char *, int, int, char *));
-static char *	__uqtoa __P((u_quad_t, char *, int, int, char *));
-static void	__find_arguments __P((const char *, va_list, void ***));
-static void	__grow_type_table __P((int, unsigned char **, int *));
+static int	__sprint (FILE *, struct __suio *);
+static int	__sbprintf (FILE *, const char *, va_list);
+static char *	__ultoa (u_long, char *, int, int, char *);
+static char *	__uqtoa (u_quad_t, char *, int, int, char *);
+static void	__find_arguments (const char *, va_list, void ***);
+static void	__grow_type_table (int, unsigned char **, int *);
 
 /*
  * Flush out all the vectors defined by the given uio,
@@ -248,8 +248,8 @@
 #define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
 #define	DEFPREC		6
 
-static char *cvt __P((double, int, int, char *, int *, int, int *, char **));
-static int exponent __P((char *, int, int));
+static char *cvt (double, int, int, char *, int *, int, int *, char **);
+static int exponent (char *, int, int);
 
 #else /* no FLOATING_POINT */
 
@@ -1190,7 +1190,7 @@
 
 #ifdef FLOATING_POINT
 
-extern char *__dtoa __P((double, int, int, int *, int *, char **, char **));
+extern char *__dtoa (double, int, int, int *, int *, char **, char **);
 
 static char *
 cvt(double value, int ndigits, int flags, char *sign, int *decpt,
Index: lib/libcr/stdio/vsscanf.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdio/vsscanf.c,v
retrieving revision 1.3
diff -u -r1.3 vsscanf.c
--- lib/libcr/stdio/vsscanf.c	9 Nov 2003 02:34:02 -0000	1.3
+++ lib/libcr/stdio/vsscanf.c	12 Nov 2003 17:19:05 -0000
@@ -43,7 +43,7 @@
 #include <string.h>
 
 static int
-eofread __P((void *, char *, int));
+eofread (void *, char *, int);
 
 /* ARGSUSED */
 static int
Index: lib/libcr/stdlib/bsearch.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/bsearch.c,v
retrieving revision 1.2
diff -u -r1.2 bsearch.c
--- lib/libcr/stdlib/bsearch.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/bsearch.c	12 Nov 2003 17:19:05 -0000
@@ -59,7 +59,7 @@
 	const void *base0;
 	size_t nmemb;
 	register size_t size;
-	register int (*compar) __P((const void *, const void *));
+	register int (*compar) (const void *, const void *);
 {
 	register const char *base = base0;
 	register size_t lim;
Index: lib/libcr/stdlib/getenv.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/getenv.c,v
retrieving revision 1.2
diff -u -r1.2 getenv.c
--- lib/libcr/stdlib/getenv.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/getenv.c	12 Nov 2003 17:19:05 -0000
@@ -38,7 +38,7 @@
 #include <stddef.h>
 #include <string.h>
 
-inline char *__findenv __P((const char *, int *));
+inline char *__findenv (const char *, int *);
 
 /*
  * __findenv --
Index: lib/libcr/stdlib/heapsort.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/heapsort.c,v
retrieving revision 1.2
diff -u -r1.2 heapsort.c
--- lib/libcr/stdlib/heapsort.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/heapsort.c	12 Nov 2003 17:19:05 -0000
@@ -139,7 +139,7 @@
 heapsort(vbase, nmemb, size, compar)
 	void *vbase;
 	size_t nmemb, size;
-	int (*compar) __P((const void *, const void *));
+	int (*compar) (const void *, const void *);
 {
 	register int cnt, i, j, l;
 	register char tmp, *tmp1, *tmp2;
Index: lib/libcr/stdlib/malloc.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/malloc.c,v
retrieving revision 1.2
diff -u -r1.2 malloc.c
--- lib/libcr/stdlib/malloc.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/malloc.c	12 Nov 2003 17:19:05 -0000
@@ -237,7 +237,7 @@
 
 struct ut { void *p; size_t s; void *r; };
 
-void utrace __P((struct ut *, int));
+void utrace (struct ut *, int);
 
 #define UTRACE(a, b, c) \
 	if (malloc_utrace) \
Index: lib/libcr/stdlib/merge.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/merge.c,v
retrieving revision 1.2
diff -u -r1.2 merge.c
--- lib/libcr/stdlib/merge.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/merge.c	12 Nov 2003 17:19:05 -0000
@@ -57,8 +57,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void setup (u_char *, u_char *, size_t, size_t, int (*)());
+static void insertionsort (u_char *, size_t, size_t, int (*)());
 
 #define ISIZE sizeof(int)
 #define PSIZE sizeof(u_char *)
@@ -98,7 +98,7 @@
 	void *base;
 	size_t nmemb;
 	register size_t size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp) (const void *, const void *);
 {
 	register int i, sense;
 	int big, iflag;
@@ -259,7 +259,7 @@
 void
 setup(list1, list2, n, size, cmp)
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp) (const void *, const void *);
 	u_char *list1, *list2;
 {
 	int i, length, size2, tmp, sense;
@@ -334,7 +334,7 @@
 insertionsort(a, n, size, cmp)
 	u_char *a;
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp) (const void *, const void *);
 {
 	u_char *ai, *s, *t, *u, tmp;
 	int i;
Index: lib/libcr/stdlib/netbsd_strtod.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/netbsd_strtod.c,v
retrieving revision 1.2
diff -u -r1.2 netbsd_strtod.c
--- lib/libcr/stdlib/netbsd_strtod.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/netbsd_strtod.c	12 Nov 2003 17:19:05 -0000
@@ -142,7 +142,7 @@
 #include "memory.h"
 #endif
 #endif
-char *__dtoa __P((double, int, int, int *, int *, char **, char **));
+char *__dtoa (double, int, int, int *, int *, char **, char **);
 
 #ifdef MALLOC
 #ifdef KR_headers
Index: lib/libcr/stdlib/qsort.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/qsort.c,v
retrieving revision 1.2
diff -u -r1.2 qsort.c
--- lib/libcr/stdlib/qsort.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/qsort.c	12 Nov 2003 17:19:05 -0000
@@ -37,9 +37,9 @@
 
 #include <stdlib.h>
 
-typedef int		 cmp_t __P((const void *, const void *));
-static inline char	*med3 __P((char *, char *, char *, cmp_t *));
-static inline void	 swapfunc __P((char *, char *, int, int));
+typedef int		 cmp_t (const void *, const void *);
+static inline char	*med3 (char *, char *, char *, cmp_t *);
+static inline void	 swapfunc (char *, char *, int, int);
 
 #define min(a, b)	(a) < (b) ? a : b
 
Index: lib/libcr/stdlib/radixsort.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/radixsort.c,v
retrieving revision 1.2
diff -u -r1.2 radixsort.c
--- lib/libcr/stdlib/radixsort.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/radixsort.c	12 Nov 2003 17:19:05 -0000
@@ -60,9 +60,9 @@
 } stack;
 
 static inline void simplesort
-	    __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_b __P((const u_char **,
+	    (const u_char **, int, int, const u_char *, u_int);
+static void r_sort_a (const u_char **, int, int, const u_char *, u_int);
+static void r_sort_b (const u_char **,
 	    const u_char **, int, int, const u_char *, u_int));
 
 #define	THRESHOLD	20		/* Divert to simplesort(). */
Index: lib/libcr/stdlib/random.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/random.c,v
retrieving revision 1.2
diff -u -r1.2 random.c
--- lib/libcr/stdlib/random.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/random.c	12 Nov 2003 17:19:05 -0000
@@ -210,7 +210,7 @@
 static long rand_sep = SEP_3;
 static long *end_ptr = &randtbl[DEG_3 + 1];
 
-static inline long good_rand __P((long));
+static inline long good_rand (long);
 
 static inline long good_rand (x)
 	register long x;
Index: lib/libcr/stdlib/setenv.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/setenv.c,v
retrieving revision 1.2
diff -u -r1.2 setenv.c
--- lib/libcr/stdlib/setenv.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/setenv.c	12 Nov 2003 17:19:05 -0000
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-char *__findenv __P((const char *, int *));
+char *__findenv (const char *, int *);
 
 /*
  * setenv --
Index: lib/libcr/stdlib/tdelete.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/tdelete.c,v
retrieving revision 1.2
diff -u -r1.2 tdelete.c
--- lib/libcr/stdlib/tdelete.c	17 Jun 2003 04:26:46 -0000	1.2
@@ -26,7 +26,7 @@
 tdelete(vkey, vrootp, compar)
 	const void *vkey;	/* key to be deleted */
 	void      **vrootp;	/* address of the root of tree */
-	int       (*compar) __P((const void *, const void *));
+	int       (*compar) (const void *, const void *);
 {
 	node_t **rootp = (node_t **)vrootp;
 	node_t *p, *q, *r;
Index: lib/libcr/stdlib/tfind.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/tfind.c,v
retrieving revision 1.2
diff -u -r1.2 tfind.c
--- lib/libcr/stdlib/tfind.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/tfind.c	12 Nov 2003 17:19:05 -0000
@@ -25,7 +25,7 @@
 tfind(vkey, vrootp, compar)
 	const void *vkey;		/* key to be found */
 	void **vrootp;			/* address of the tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar) (const void *, const void *);
 {
 	node_t **rootp = (node_t **)vrootp;
 
Index: lib/libcr/stdlib/tsearch.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/tsearch.c,v
retrieving revision 1.2
diff -u -r1.2 tsearch.c
--- lib/libcr/stdlib/tsearch.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/tsearch.c	12 Nov 2003 17:19:05 -0000
@@ -25,7 +25,7 @@
 tsearch(vkey, vrootp, compar)
 	const void *vkey;		/* key to be located */
 	void **vrootp;			/* address of tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar) (const void *, const void *);
 {
 	node_t *q;
 	node_t **rootp = (node_t **)vrootp;
Index: lib/libcr/stdlib/twalk.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/stdlib/twalk.c,v
retrieving revision 1.2
diff -u -r1.2 twalk.c
--- lib/libcr/stdlib/twalk.c	17 Jun 2003 04:26:46 -0000	1.2
+++ lib/libcr/stdlib/twalk.c	12 Nov 2003 17:19:05 -0000
@@ -20,14 +20,14 @@
 #include <search.h>
 #include <stdlib.h>
 
-static void trecurse __P((const node_t *,
+static void trecurse (const node_t *,
     void  (*action)(const void *, VISIT, int), int level));
 
 /* Walk the nodes of a tree */
 static void
 trecurse(root, action, level)
 	const node_t *root;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action) (const void *, VISIT, int);
 	int level;
 {
 
@@ -48,7 +48,7 @@
 void
 twalk(vroot, action)
 	const void *vroot;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action) (const void *, VISIT, int);
 {
 	if (vroot != NULL && action != NULL)
 		trecurse(vroot, action, 0);
Index: lib/libcr/xdr/xdr_rec.c
===================================================================
RCS file: /home/dcvs/src/lib/libcr/xdr/xdr_rec.c,v
retrieving revision 1.2
diff -u -r1.2 xdr_rec.c
--- lib/libcr/xdr/xdr_rec.c	17 Jun 2003 04:26:47 -0000	1.2
+++ lib/libcr/xdr/xdr_rec.c	12 Nov 2003 17:19:06 -0000
@@ -103,7 +103,7 @@
 	/*
 	 * out-goung bits
 	 */
-	int (*writeit) __P((caddr_t, caddr_t, int));
+	int (*writeit) (caddr_t, caddr_t, int);
 	caddr_t out_base;	/* output buffer (points to frag header) */
 	caddr_t out_finger;	/* next output position */
 	caddr_t out_boundry;	/* data cannot up to this address */
@@ -112,7 +112,7 @@
 	/*
 	 * in-coming bits
 	 */
-	int (*readit) __P((caddr_t, caddr_t, int));
+	int (*readit) (caddr_t, caddr_t, int);
 	u_long in_size;	/* fixed size of the input buffer */
 	caddr_t in_base;
 	caddr_t in_finger;	/* location of next byte to be had */
Index: lib/libedit/chared.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/chared.c,v
retrieving revision 1.2
diff -u -r1.2 chared.c
--- lib/libedit/chared.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/chared.c	12 Nov 2003 17:19:06 -0000
@@ -183,7 +183,7 @@
 c__prev_word(p, low, n, wtest)
     register char *p, *low;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest) (int);
 {
     p--;
 
@@ -210,7 +210,7 @@
 c__next_word(p, high, n, wtest)
     register char *p, *high;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest) (int);
 {
     while (n--) {
 	while ((p < high) && !(*wtest)((unsigned char) *p))
@@ -232,7 +232,7 @@
     EditLine *el;
     register char *p, *high;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest) (int);
 {
     int test;
 
@@ -265,7 +265,7 @@
     EditLine *el;
     register char *p, *low;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest) (int);
 {
     int test;
 
Index: lib/libedit/chared.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/chared.h,v
retrieving revision 1.1
diff -u -r1.1 chared.h
--- lib/libedit/chared.h	17 Jun 2003 02:51:26 -0000	1.1
+++ lib/libedit/chared.h	12 Nov 2003 17:46:17 -0000
@@ -134,26 +134,26 @@
 #include "fcns.h"
 
 
-protected int   cv__isword	__P((int));
-protected void  cv_delfini	__P((EditLine *));
-protected char *cv__endword	__P((char *, char *, int));
-protected int   ce__isword	__P((int));
-protected int   c___isword	__P((int));
-protected void  cv_undo		__P((EditLine *, int, int, char *));
-protected char *cv_next_word	__P((EditLine*, char *, char *, int,
-				     int (*)(int)));
-protected char *cv_prev_word	__P((EditLine*, char *, char *, int,
-				     int (*)(int)));
-protected char *c__next_word	__P((char *, char *, int, int (*)(int)));
-protected char *c__prev_word	__P((char *, char *, int, int (*)(int)));
-protected void  c_insert	__P((EditLine *, int));
-protected void  c_delbefore	__P((EditLine *, int));
-protected void  c_delafter	__P((EditLine *, int));
-protected int   c_gets		__P((EditLine *, char *));
-protected int   c_hpos		__P((EditLine *));
+protected int   cv__isword	(int);
+protected void  cv_delfini	(EditLine *);
+protected char *cv__endword	(char *, char *, int);
+protected int   ce__isword	(int);
+protected int   c___isword	(int);
+protected void  cv_undo		(EditLine *, int, int, char *);
+protected char *cv_next_word	(EditLine*, char *, char *, int,
+				     int (*)(int));
+protected char *cv_prev_word	(EditLine*, char *, char *, int,
+				     int (*)(int));
+protected char *c__next_word	(char *, char *, int, int (*)(int));
+protected char *c__prev_word	(char *, char *, int, int (*)(int));
+protected void  c_insert	(EditLine *, int);
+protected void  c_delbefore	(EditLine *, int);
+protected void  c_delafter	(EditLine *, int);
+protected int   c_gets		(EditLine *, char *);
+protected int   c_hpos		(EditLine *);
 
-protected int   ch_init		__P((EditLine *));
-protected void  ch_reset	__P((EditLine *));
-protected void  ch_end		__P((EditLine *));
+protected int   ch_init		(EditLine *);
+protected void  ch_reset	(EditLine *);
+protected void  ch_end		(EditLine *);
 
 #endif /* _h_el_chared */
Index: lib/libedit/hist.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/hist.h,v
retrieving revision 1.1
diff -u -r1.1 hist.h
--- lib/libedit/hist.h	17 Jun 2003 02:51:26 -0000	1.1
+++ lib/libedit/hist.h	12 Nov 2003 17:19:06 -0000
@@ -44,7 +44,7 @@
 
 #include "histedit.h"
 
-typedef const HistEvent *	(*hist_fun_t) __P((ptr_t, int, ...));
+typedef const HistEvent *	(*hist_fun_t) (ptr_t, int, ...);
 
 typedef struct el_history_t {
     char *buf;				/* The history buffer		*/
@@ -68,10 +68,10 @@
 #define HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
 #define HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
 
-protected int 		hist_init	__P((EditLine *));
-protected void 		hist_end	__P((EditLine *));
-protected el_action_t	hist_get	__P((EditLine *));
-protected int		hist_set	__P((EditLine *, hist_fun_t, ptr_t));
-protected int		hist_list	__P((EditLine *, int, char **));
+protected int 		hist_init	(EditLine *);
+protected void 		hist_end	(EditLine *);
+protected el_action_t	hist_get	(EditLine *);
+protected int		hist_set	(EditLine *, hist_fun_t, ptr_t);
+protected int		hist_list	(EditLine *, int, char **);
 
 #endif /* _h_el_hist */
Index: lib/libedit/history.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/history.c,v
retrieving revision 1.2
diff -u -r1.2 history.c
--- lib/libedit/history.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/history.c	12 Nov 2003 17:19:06 -0000
@@ -53,9 +53,9 @@
 
 #include "histedit.h"
 
-typedef const HistEvent *	(*history_gfun_t) __P((ptr_t));
-typedef const HistEvent *	(*history_efun_t) __P((ptr_t, const char *));
-typedef void			(*history_vfun_t) __P((ptr_t));
+typedef const HistEvent *	(*history_gfun_t) (ptr_t);
+typedef const HistEvent *	(*history_efun_t) (ptr_t, const char *);
+typedef void			(*history_vfun_t) (ptr_t);
 
 struct history {
     ptr_t	   h_ref;		/* Argument for history fcns	*/
@@ -82,14 +82,14 @@
 #define h_free(a)	free(a)
 
 
-private int		 history_set_num	__P((History *, int));
-private int		 history_set_fun	__P((History *, History *));
-private int		 history_load		__P((History *, const char *));
-private int		 history_save		__P((History *, const char *));
-private const HistEvent *history_prev_event	__P((History *, int));
-private const HistEvent *history_next_event	__P((History *, int));
-private const HistEvent *history_next_string	__P((History *, const char *));
-private const HistEvent *history_prev_string	__P((History *, const char *));
+private int		 history_set_num	(History *, int);
+private int		 history_set_fun	(History *, History *);
+private int		 history_load		(History *, const char *);
+private int		 history_save		(History *, const char *);
+private const HistEvent *history_prev_event	(History *, int);
+private const HistEvent *history_next_event	(History *, int);
+private const HistEvent *history_next_string	(History *, const char *);
+private const HistEvent *history_prev_string	(History *, const char *);
 
 
 /***********************************************************************/
@@ -111,17 +111,17 @@
     int	eventno;		/* Current event number		*/
 } history_t;
 
-private const HistEvent *history_def_first  __P((ptr_t));
-private const HistEvent *history_def_last   __P((ptr_t));
-private const HistEvent *history_def_next   __P((ptr_t));
-private const HistEvent *history_def_prev   __P((ptr_t));
-private const HistEvent *history_def_curr   __P((ptr_t));
-private const HistEvent *history_def_enter  __P((ptr_t, const char *));
-private const HistEvent *history_def_add    __P((ptr_t, const char *));
-private void             history_def_init   __P((ptr_t *, int));
-private void             history_def_clear  __P((ptr_t));
-private const HistEvent *history_def_insert __P((history_t *, const char *));
-private void             history_def_delete __P((history_t *, hentry_t *));
+private const HistEvent *history_def_first  (ptr_t);
+private const HistEvent *history_def_last   (ptr_t);
+private const HistEvent *history_def_next   (ptr_t);
+private const HistEvent *history_def_prev   (ptr_t);
+private const HistEvent *history_def_curr   (ptr_t);
+private const HistEvent *history_def_enter  (ptr_t, const char *);
+private const HistEvent *history_def_add    (ptr_t, const char *);
+private void             history_def_init   (ptr_t *, int);
+private void             history_def_clear  (ptr_t);
+private const HistEvent *history_def_insert (history_t *, const char *);
+private void             history_def_delete (history_t *, hentry_t *);
 
 #define history_def_set(p, num)	(void) (((history_t *) p)->max = (num))
 
Index: lib/libedit/key.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/key.c,v
retrieving revision 1.2
diff -u -r1.2 key.c
--- lib/libedit/key.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/key.c	12 Nov 2003 17:47:19 -0000
@@ -76,17 +76,17 @@
     struct key_node_t *sibling;	/* ptr to another key with same prefix 	*/
 };
 
-private	int            node_trav	__P((EditLine *, key_node_t *, char *,
-					     key_value_t *));
-private	int            node__try	__P((key_node_t *, char *,
-					     key_value_t *, int));
-private	key_node_t    *node__get	__P((int));
-private	void	       node__put	__P((key_node_t *));
-private	int	       node__delete	__P((key_node_t **, char *));
-private	int	       node_lookup 	__P((EditLine *, char *, key_node_t *,
-					     int));
-private	int	       node_enum	__P((EditLine *, key_node_t *, int));
-private	int	       key__decode_char	__P((char *, int, int));
+private	int            node_trav	(EditLine *, key_node_t *, char *,
+					     key_value_t *);
+private	int            node__try	(key_node_t *, char *,
+					     key_value_t *, int);
+private	key_node_t    *node__get	(int);
+private	void	       node__put	(key_node_t *);
+private	int	       node__delete	(key_node_t **, char *);
+private	int	       node_lookup 	(EditLine *, char *, key_node_t *,
+					     int);
+private	int	       node_enum	(EditLine *, key_node_t *, int);
+private	int	       key__decode_char	(char *, int, int);
 
 #define KEY_BUFSIZ	EL_BUFSIZ
 
Index: lib/libedit/key.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/key.h,v
retrieving revision 1.1
diff -u -r1.1 key.h
--- lib/libedit/key.h	17 Jun 2003 02:51:26 -0000	1.1
+++ lib/libedit/key.h	12 Nov 2003 17:45:34 -0000
@@ -60,21 +60,21 @@
 #define XK_NOD	2
 #define XK_EXE	3
 
-protected int 		key_init	__P((EditLine *));
-protected void 		key_end		__P((EditLine *));
-protected key_value_t *	key_map_cmd	__P((EditLine *, int));
-protected key_value_t *	key_map_str	__P((EditLine *, char *));
-protected void		key_reset	__P((EditLine *));
-protected int 		key_get		__P((EditLine *, char *,
-					     key_value_t *));
-protected void		key_add		__P((EditLine *, char *, key_value_t *,
-					     int));
-protected void		key_clear	__P((EditLine *, el_action_t *,
-					     char *));
-protected int		key_delete	__P((EditLine *, char *));
-protected void		key_print	__P((EditLine *, char *));
-protected void	        key_kprint	__P((EditLine *, char *,
-					     key_value_t *, int));
-protected char 	       *key__decode_str	__P((char *, char *, char *));
+protected int 		key_init	(EditLine *);
+protected void 		key_end		(EditLine *);
+protected key_value_t *	key_map_cmd	(EditLine *, int);
+protected key_value_t *	key_map_str	(EditLine *, char *);
+protected void		key_reset	(EditLine *);
+protected int 		key_get		(EditLine *, char *,
+					     key_value_t *);
+protected void		key_add		(EditLine *, char *, key_value_t *,
+					     int);
+protected void		key_clear	(EditLine *, el_action_t *,
+					     char *);
+protected int		key_delete	(EditLine *, char *);
+protected void		key_print	(EditLine *, char *);
+protected void	        key_kprint	(EditLine *, char *,
+					     key_value_t *, int);
+protected char 	       *key__decode_str	(char *, char *, char *);
 
 #endif /* _h_el_key */
Index: lib/libedit/makelist
===================================================================
RCS file: /home/dcvs/src/lib/libedit/makelist,v
retrieving revision 1.1
diff -u -r1.1 makelist
--- lib/libedit/makelist	17 Jun 2003 02:51:26 -0000	1.1
+++ lib/libedit/makelist	12 Nov 2003 17:20:24 -0000
@@ -69,7 +69,7 @@
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
 		name = substr($2, 1, length($2) - 3);
-		printf("protected el_action_t\t%-25.25s __P((EditLine *, int));\n", name);
+		printf("protected el_action_t\t%-25.25s (EditLine *, int);\n", name);
 	    }
 	}
 	END {
@@ -124,7 +124,7 @@
 	BEGIN { 
 	    printf("/* Automatically generated file, do not edit */\n");
 	    printf("#ifndef _h_help_c\n#define _h_help_c\n");
-	    printf("protected el_bindings_t *help__get\t__P((void));\n");
+	    printf("protected el_bindings_t *help__get\t(void);\n");
 	    printf("#endif /* _h_help_c */\n");
 	}' /dev/null;;
 -fh)
@@ -141,8 +141,8 @@
 	END {
 	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
 
-	    printf("typedef el_action_t (*el_func_t) __P((EditLine *, int));");
-	    printf("\nprotected el_func_t* func__get __P((void));\n");
+	    printf("typedef el_action_t (*el_func_t) (EditLine *, int);");
+	    printf("\nprotected el_func_t* func__get (void);\n");
 	    printf("#endif /* _h_fcns_c */\n");
 	}';;
 -fc)
Index: lib/libedit/map.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/map.c,v
retrieving revision 1.2
diff -u -r1.2 map.c
--- lib/libedit/map.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/map.c	12 Nov 2003 17:19:06 -0000
@@ -45,11 +45,11 @@
 
 #define N_KEYS 256
 
-private void map_print_key	 __P((EditLine *, el_action_t *, char *));
-private void map_print_some_keys __P((EditLine *, el_action_t *, int, int));
-private void map_print_all_keys	 __P((EditLine *));
-private void map_init_nls 	 __P((EditLine *));
-private void map_init_meta	 __P((EditLine *));
+private void map_print_key	 (EditLine *, el_action_t *, char *);
+private void map_print_some_keys (EditLine *, el_action_t *, int, int);
+private void map_print_all_keys	 (EditLine *);
+private void map_init_nls 	 (EditLine *);
+private void map_init_meta	 (EditLine *);
 
 /* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */
 
Index: lib/libedit/map.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/map.h,v
retrieving revision 1.1
diff -u -r1.1 map.h
--- lib/libedit/map.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/map.h	12 Nov 2003 17:47:02 -0000
@@ -65,13 +65,13 @@
 #define MAP_EMACS	0
 #define MAP_VI		1
 
-protected int	map_bind		__P((EditLine *, int, char **));
-protected int	map_init		__P((EditLine *));
-protected void	map_end			__P((EditLine *));
-protected void	map_init_vi		__P((EditLine *));
-protected void	map_init_emacs		__P((EditLine *));
-protected int	map_set_editor		__P((EditLine *, char *));
-protected int	map_addfunc		__P((EditLine *, const char *,
-					     const char *, el_func_t));
+protected int	map_bind		(EditLine *, int, char **);
+protected int	map_init		(EditLine *);
+protected void	map_end			(EditLine *);
+protected void	map_init_vi		(EditLine *);
+protected void	map_init_emacs		(EditLine *);
+protected int	map_set_editor		(EditLine *, char *);
+protected int	map_addfunc		(EditLine *, const char *,
+					     const char *, el_func_t);
 
 #endif /* _h_el_map */
Index: lib/libedit/parse.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/parse.c,v
retrieving revision 1.2
diff -u -r1.2 parse.c
--- lib/libedit/parse.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/parse.c	12 Nov 2003 17:19:06 -0000
@@ -55,7 +55,7 @@
 
 private struct {
     char *name;
-    int (*func) __P((EditLine *, int, char **));
+    int (*func) (EditLine *, int, char **);
 } cmds[] = {
     {	"bind",		map_bind 	},
     {	"echotc",	term_echotc 	},
Index: lib/libedit/parse.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/parse.h,v
retrieving revision 1.1
diff -u -r1.1 parse.h
--- lib/libedit/parse.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/parse.h	12 Nov 2003 17:19:06 -0000
@@ -42,9 +42,9 @@
 #ifndef _h_el_parse
 #define _h_el_parse
 
-protected int		 parse_line	__P((EditLine *, const char *));
-protected int		 parse__escape	__P((const char ** const));
-protected char *	 parse__string	__P((char *, const char *));
-protected int		 parse_cmd	__P((EditLine *, const char *));
+protected int		 parse_line	(EditLine *, const char *);
+protected int		 parse__escape	(const char ** const);
+protected char *	 parse__string	(char *, const char *);
+protected int		 parse_cmd	(EditLine *, const char *);
 
 #endif /* _h_el_parse */
Index: lib/libedit/prompt.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/prompt.c,v
retrieving revision 1.2
diff -u -r1.2 prompt.c
--- lib/libedit/prompt.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/prompt.c	12 Nov 2003 17:19:06 -0000
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include "el.h"
 
-private char *prompt_default	__P((EditLine *));
+private char *prompt_default	(EditLine *);
 
 /* prompt_default():
  *	Just a default prompt, in case the user did not provide one
Index: lib/libedit/prompt.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/prompt.h,v
retrieving revision 1.1
diff -u -r1.1 prompt.h
--- lib/libedit/prompt.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/prompt.h	12 Nov 2003 17:19:06 -0000
@@ -44,16 +44,16 @@
 
 #include "histedit.h"
 
-typedef char * (*el_pfunc_t) __P((EditLine*));
+typedef char * (*el_pfunc_t) (EditLine*);
 
 typedef struct el_prompt_t {
     el_pfunc_t p_func;		/* Function to return the prompt	*/
     coord_t    p_pos;		/* position in the line after prompt	*/
 } el_prompt_t;
 
-protected void prompt_print	__P((EditLine *));
-protected int  prompt_set	__P((EditLine *, el_pfunc_t));
-protected int  prompt_init	__P((EditLine *));
-protected void prompt_end	__P((EditLine *));
+protected void prompt_print	(EditLine *);
+protected int  prompt_set	(EditLine *, el_pfunc_t);
+protected int  prompt_init	(EditLine *);
+protected void prompt_end	(EditLine *);
 
 #endif /* _h_el_prompt */
Index: lib/libedit/read.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/read.c,v
retrieving revision 1.2
diff -u -r1.2 read.c
--- lib/libedit/read.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/read.c	12 Nov 2003 17:19:06 -0000
@@ -51,9 +51,9 @@
 
 #define OKCMD -1
 
-private int read__fixio		__P((int, int));
-private int read_preread	__P((EditLine *));
-private int read_getcmd		__P((EditLine *, el_action_t *, char *));
+private int read__fixio		(int, int);
+private int read_preread	(EditLine *);
+private int read_getcmd		(EditLine *, el_action_t *, char *);
 
 #ifdef DEBUG_EDIT
 private void
Index: lib/libedit/refresh.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/refresh.c,v
retrieving revision 1.2
diff -u -r1.2 refresh.c
--- lib/libedit/refresh.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/refresh.c	12 Nov 2003 17:47:41 -0000
@@ -46,20 +46,20 @@
 
 #include "el.h"
 
-private	void	re_addc 		__P((EditLine *, int));
-private	void	re_update_line 		__P((EditLine *, char *, char *, int));
-private	void	re_insert		__P((EditLine *, char *, int, int,
-					     char *, int));
-private	void	re_delete		__P((EditLine *, char *, int, int,
-					     int));
-private	void	re_fastputc		__P((EditLine *, int));
+private	void	re_addc 		(EditLine *, int);
+private	void	re_update_line 		(EditLine *, char *, char *, int);
+private	void	re_insert		(EditLine *, char *, int, int,
+					     char *, int);
+private	void	re_delete		(EditLine *, char *, int, int,
+					     int);
+private	void	re_fastputc		(EditLine *, int);
 
-private	void	re__strncopy		__P((char *, char *, size_t));
-private	void	re__copy_and_pad	__P((char *, char *, size_t));
+private	void	re__strncopy		(char *, char *, size_t);
+private	void	re__copy_and_pad	(char *, char *, size_t);
 
 #ifdef DEBUG_REFRESH
-private	void	re_printstr		__P((EditLine *, char *, char *,
-					     char *));
+private	void	re_printstr		(EditLine *, char *, char *,
+					     char *);
 # define __F el->el_errfile
 # define RE_DEBUG(a, b, c)	do 				\
 				    if (a) {			\
Index: lib/libedit/refresh.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/refresh.h,v
retrieving revision 1.1
diff -u -r1.1 refresh.h
--- lib/libedit/refresh.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/refresh.h	12 Nov 2003 17:19:06 -0000
@@ -49,12 +49,12 @@
     int r_oldcv, r_newcv;	/* Vertical locations		*/
 } el_refresh_t;
 
-protected void	re_putc 		__P((EditLine *, int));
-protected void	re_clear_lines		__P((EditLine *));
-protected void	re_clear_display	__P((EditLine *));
-protected void	re_refresh		__P((EditLine *));
-protected void	re_refresh_cursor	__P((EditLine *));
-protected void	re_fastaddc		__P((EditLine *));
-protected void	re_goto_bottom		__P((EditLine *));
+protected void	re_putc 		(EditLine *, int);
+protected void	re_clear_lines		(EditLine *);
+protected void	re_clear_display	(EditLine *);
+protected void	re_refresh		(EditLine *);
+protected void	re_refresh_cursor	(EditLine *);
+protected void	re_fastaddc		(EditLine *);
+protected void	re_goto_bottom		(EditLine *);
 
 #endif /* _h_el_refresh */
Index: lib/libedit/search.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/search.c,v
retrieving revision 1.2
diff -u -r1.2 search.c
--- lib/libedit/search.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/search.c	12 Nov 2003 17:19:07 -0000
@@ -109,8 +109,8 @@
     regexp *rp;
     int rv;
 #else 
-    extern char *re_comp __P((const char *));
-    extern int re_exec __P((const char *));
+    extern char *re_comp (const char *);
+    extern int re_exec (const char *);
 #endif
 
     if (strstr(str, pat) != NULL)
Index: lib/libedit/search.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/search.h,v
retrieving revision 1.1
diff -u -r1.1 search.h
--- lib/libedit/search.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/search.h	12 Nov 2003 17:19:07 -0000
@@ -53,16 +53,16 @@
 } el_search_t;
 
 
-protected int 		el_match	__P((const char *, const char *));
-protected int		search_init	__P((EditLine *));
-protected void		search_end	__P((EditLine *));
-protected int		c_hmatch	__P((EditLine *, const char *));
-protected void		c_setpat	__P((EditLine *));
-protected el_action_t	ce_inc_search	__P((EditLine *, int));
-protected el_action_t	cv_search	__P((EditLine *, int));
-protected el_action_t	ce_search_line	__P((EditLine *, char *, int));
-protected el_action_t	cv_repeat_srch	__P((EditLine *, int));
-protected el_action_t	cv_csearch_back	__P((EditLine *, int, int, int));
-protected el_action_t	cv_csearch_fwd	__P((EditLine *, int, int, int));
+protected int 		el_match	(const char *, const char *);
+protected int		search_init	(EditLine *);
+protected void		search_end	(EditLine *);
+protected int		c_hmatch	(EditLine *, const char *);
+protected void		c_setpat	(EditLine *);
+protected el_action_t	ce_inc_search	(EditLine *, int);
+protected el_action_t	cv_search	(EditLine *, int);
+protected el_action_t	ce_search_line	(EditLine *, char *, int);
+protected el_action_t	cv_repeat_srch	(EditLine *, int);
+protected el_action_t	cv_csearch_back	(EditLine *, int, int, int);
+protected el_action_t	cv_csearch_fwd	(EditLine *, int, int, int);
 
 #endif /* _h_el_search */
Index: lib/libedit/sig.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/sig.c,v
retrieving revision 1.2
diff -u -r1.2 sig.c
--- lib/libedit/sig.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/sig.c	12 Nov 2003 17:19:07 -0000
@@ -57,7 +57,7 @@
     -1
 };
 
-private void sig_handler	__P((int));
+private void sig_handler	(int);
 
 /* sig_handler():
  *	This is the handler called for all signals
Index: lib/libedit/sig.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/sig.h,v
retrieving revision 1.1
diff -u -r1.1 sig.h
--- lib/libedit/sig.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/sig.h	12 Nov 2003 17:19:07 -0000
@@ -62,9 +62,9 @@
 
 typedef sig_t *el_signal_t;
 
-protected void	sig_end		__P((EditLine*));
-protected int	sig_init	__P((EditLine*));
-protected void	sig_set		__P((EditLine*));
-protected void	sig_clr		__P((EditLine*));
+protected void	sig_end		(EditLine*);
+protected int	sig_init	(EditLine*);
+protected void	sig_set		(EditLine*);
+protected void	sig_clr		(EditLine*);
 
 #endif /* _h_el_sig */
Index: lib/libedit/sys.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/sys.h,v
retrieving revision 1.1
diff -u -r1.1 sys.h
--- lib/libedit/sys.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/sys.h	12 Nov 2003 17:19:07 -0000
@@ -83,33 +83,33 @@
 # undef REGEX
 # undef REGEXP
 # include <malloc.h>
-typedef void (*sig_t)__P((int));
+typedef void (*sig_t)(int);
 # ifdef __GNUC__
 /*
  * Broken hdrs.
  */
-extern char    *getenv		__P((const char *));
-extern int	fprintf		__P((FILE *, const char *, ...));
-extern int	sigsetmask	__P((int));
-extern int	sigblock	__P((int));
-extern int	ioctl		__P((int, int, void *));
-extern int	fputc		__P((int, FILE *));
-extern int	fgetc		__P((FILE *));
-extern int	fflush		__P((FILE *));
-extern int	tolower		__P((int));
-extern int	toupper		__P((int));
+extern char    *getenv		(const char *);
+extern int	fprintf		(FILE *, const char *, ...);
+extern int	sigsetmask	(int);
+extern int	sigblock	(int);
+extern int	ioctl		(int, int, void *);
+extern int	fputc		(int, FILE *);
+extern int	fgetc		(FILE *);
+extern int	fflush		(FILE *);
+extern int	tolower		(int);
+extern int	toupper		(int);
 extern int	errno, sys_nerr;
 extern char	*sys_errlist[];
-extern void	perror		__P((const char *));
-extern int	read		__P((int, const char*, int));
+extern void	perror		(const char *);
+extern int	read		(int, const char*, int);
 #  include <string.h>
 #  define strerror(e)	sys_errlist[e]
 # endif
 # ifdef SABER
-extern ptr_t    memcpy		__P((ptr_t, const ptr_t, size_t));
-extern ptr_t    memset		__P((ptr_t, int, size_t));
+extern ptr_t    memcpy		(ptr_t, const ptr_t, size_t);
+extern ptr_t    memset		(ptr_t, int, size_t);
 # endif
-extern char    *fgetline	__P((FILE *, int *));
+extern char    *fgetline	(FILE *, int *);
 #endif
 
 #endif /* _h_sys */
Index: lib/libedit/term.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/term.c,v
retrieving revision 1.2
diff -u -r1.2 term.c
--- lib/libedit/term.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/term.c	12 Nov 2003 17:47:50 -0000
@@ -177,13 +177,13 @@
 
 /* do two or more of the attributes use me */
 
-private	void	term_rebuffer_display	__P((EditLine *));
-private	void	term_free_display	__P((EditLine *));
-private	void	term_alloc_display	__P((EditLine *));
-private	void	term_alloc		__P((EditLine *,
-					     struct termcapstr *, char *));
-private void	term_init_arrow		__P((EditLine *));
-private void	term_reset_arrow	__P((EditLine *));
+private	void	term_rebuffer_display	(EditLine *);
+private	void	term_free_display	(EditLine *);
+private	void	term_alloc_display	(EditLine *);
+private	void	term_alloc		(EditLine *,
+					     struct termcapstr *, char *);
+private void	term_init_arrow		(EditLine *);
+private void	term_reset_arrow	(EditLine *);
 
 
 private FILE *term_outfile = NULL;	/* XXX: How do we fix that? */
Index: lib/libedit/term.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/term.h,v
retrieving revision 1.2
diff -u -r1.2 term.h
--- lib/libedit/term.h	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/term.h	12 Nov 2003 17:45:51 -0000
@@ -83,30 +83,30 @@
 #define A_K_EN		5
 #define A_K_NKEYS	6
 
-protected void term_move_to_line	__P((EditLine *, int));
-protected void term_move_to_char	__P((EditLine *, int));
-protected void term_clear_EOL		__P((EditLine *, int));
-protected void term_overwrite		__P((EditLine *, char *, int));
-protected void term_insertwrite		__P((EditLine *, char *, int));
-protected void term_deletechars		__P((EditLine *, int));
-protected void term_clear_screen	__P((EditLine *));
-protected void term_beep		__P((EditLine *));
-protected void term_change_size		__P((EditLine *, int, int));
-protected int  term_get_size		__P((EditLine *, int *, int *));
-protected int  term_init		__P((EditLine *));
-protected void term_bind_arrow		__P((EditLine *));
-protected void term_print_arrow		__P((EditLine *, char *));
-protected int  term_clear_arrow		__P((EditLine *, char *));
-protected int  term_set_arrow		__P((EditLine *, char *,
-					     key_value_t *, int));
-protected void term_end			__P((EditLine *));
-protected int  term_set			__P((EditLine *, char *));
-protected int  term_settc		__P((EditLine *, int, char **));
-protected int  term_telltc		__P((EditLine *, int, char **));
-protected int  term_echotc		__P((EditLine *, int, char **));
+protected void term_move_to_line	(EditLine *, int);
+protected void term_move_to_char	(EditLine *, int);
+protected void term_clear_EOL		(EditLine *, int);
+protected void term_overwrite		(EditLine *, char *, int);
+protected void term_insertwrite		(EditLine *, char *, int);
+protected void term_deletechars		(EditLine *, int);
+protected void term_clear_screen	(EditLine *);
+protected void term_beep		(EditLine *);
+protected void term_change_size		(EditLine *, int, int);
+protected int  term_get_size		(EditLine *, int *, int *);
+protected int  term_init		(EditLine *);
+protected void term_bind_arrow		(EditLine *);
+protected void term_print_arrow		(EditLine *, char *);
+protected int  term_clear_arrow		(EditLine *, char *);
+protected int  term_set_arrow		(EditLine *, char *,
+					     key_value_t *, int);
+protected void term_end			(EditLine *);
+protected int  term_set			(EditLine *, char *);
+protected int  term_settc		(EditLine *, int, char **);
+protected int  term_telltc		(EditLine *, int, char **);
+protected int  term_echotc		(EditLine *, int, char **);
 
-protected int  term__putc		__P((int));
-protected void term__flush		__P((void));
+protected int  term__putc		(int);
+protected void term__flush		(void);
 
 /*
  * Easy access macros
Index: lib/libedit/tokenizer.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/tokenizer.c,v
retrieving revision 1.2
diff -u -r1.2 tokenizer.c
--- lib/libedit/tokenizer.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/tokenizer.c	12 Nov 2003 17:19:07 -0000
@@ -72,7 +72,7 @@
 };
 
 
-private void tok_finish	__P((Tokenizer *));
+private void tok_finish	(Tokenizer *);
 
 
 /* tok_finish():
Index: lib/libedit/tokenizer.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/tokenizer.h,v
retrieving revision 1.1
diff -u -r1.1 tokenizer.h
--- lib/libedit/tokenizer.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/tokenizer.h	12 Nov 2003 17:47:28 -0000
@@ -44,10 +44,10 @@
 
 typedef struct tokenizer Tokenizer;
 
-Tokenizer 	*tok_init	__P((const char *));
-void		 tok_reset	__P((Tokenizer *));
-void		 tok_end	__P((Tokenizer *));
-int		 tok_line	__P((Tokenizer *, const char *,
-				     int *, char ***));
+Tokenizer 	*tok_init	(const char *);
+void		 tok_reset	(Tokenizer *);
+void		 tok_end	(Tokenizer *);
+int		 tok_line	(Tokenizer *, const char *,
+				     int *, char ***);
 
 #endif /* _h_tokenizer */
Index: lib/libedit/tty.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/tty.c,v
retrieving revision 1.2
diff -u -r1.2 tty.c
--- lib/libedit/tty.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/tty.c	12 Nov 2003 17:19:07 -0000
@@ -447,10 +447,10 @@
 #define tty__geteightbit(td) (((td)->c_cflag & CSIZE) == CS8)
 #define tty__cooked_mode(td) ((td)->c_lflag & ICANON)
 
-private void    tty__getchar	__P((struct termios *, unsigned char *));
-private void    tty__setchar	__P((struct termios *, unsigned char *));
-private speed_t tty__getspeed	__P((struct termios *));
-private int     tty_setup	__P((EditLine *));
+private void    tty__getchar	(struct termios *, unsigned char *);
+private void    tty__setchar	(struct termios *, unsigned char *);
+private speed_t tty__getspeed	(struct termios *);
+private int     tty_setup	(EditLine *);
 
 
Index: lib/libedit/tty.h
===================================================================
RCS file: /home/dcvs/src/lib/libedit/tty.h,v
retrieving revision 1.1
diff -u -r1.1 tty.h
--- lib/libedit/tty.h	17 Jun 2003 02:51:27 -0000	1.1
+++ lib/libedit/tty.h	12 Nov 2003 17:19:07 -0000
@@ -457,14 +457,14 @@
 
 typedef unsigned char ttychar_t[NN_IO][C_NCC];
 
-protected int	tty_init	__P((EditLine *));
-protected void	tty_end		__P((EditLine *));
-protected int	tty_stty	__P((EditLine *, int, char**));
-protected int	tty_rawmode	__P((EditLine *));
-protected int	tty_cookedmode	__P((EditLine *));
-protected int	tty_quotemode	__P((EditLine *));
-protected int	tty_noquotemode	__P((EditLine *));
-protected void	tty_bind_char	__P((EditLine *, int));
+protected int	tty_init	(EditLine *);
+protected void	tty_end		(EditLine *);
+protected int	tty_stty	(EditLine *, int, char**);
+protected int	tty_rawmode	(EditLine *);
+protected int	tty_cookedmode	(EditLine *);
+protected int	tty_quotemode	(EditLine *);
+protected int	tty_noquotemode	(EditLine *);
+protected void	tty_bind_char	(EditLine *, int);
 
 typedef struct {
     ttyperm_t t_t;
Index: lib/libedit/vi.c
===================================================================
RCS file: /home/dcvs/src/lib/libedit/vi.c,v
retrieving revision 1.2
diff -u -r1.2 vi.c
--- lib/libedit/vi.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libedit/vi.c	12 Nov 2003 17:19:07 -0000
@@ -42,7 +42,7 @@
 #include "sys.h"
 #include "el.h"
 
-private el_action_t cv_action __P((EditLine *, int));
+private el_action_t cv_action (EditLine *, int);
 
 /* cv_action():
  *	Handle vi actions.
Index: lib/libipsec/ipsec_dump_policy.c
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/ipsec_dump_policy.c,v
retrieving revision 1.2
diff -u -r1.2 ipsec_dump_policy.c
--- lib/libipsec/ipsec_dump_policy.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/ipsec_dump_policy.c	12 Nov 2003 17:48:55 -0000
@@ -56,11 +56,11 @@
 	"discard", "none", "ipsec", "entrust", "bypass",
 };
 
-static char *ipsec_dump_ipsecrequest __P((char *, size_t,
-	struct sadb_x_ipsecrequest *, size_t));
-static int set_addresses __P((char *, size_t, struct sockaddr *,
-	struct sockaddr *));
-static char *set_address __P((char *, size_t, struct sockaddr *));
+static char *ipsec_dump_ipsecrequest (char *, size_t,
+	struct sadb_x_ipsecrequest *, size_t);
+static int set_addresses (char *, size_t, struct sockaddr *,
+	struct sockaddr *);
+static char *set_address (char *, size_t, struct sockaddr *);
 
 /*
  * policy is sadb_x_policy buffer.
Index: lib/libipsec/ipsec_strerror.h
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/ipsec_strerror.h,v
retrieving revision 1.2
diff -u -r1.2 ipsec_strerror.h
--- lib/libipsec/ipsec_strerror.h	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/ipsec_strerror.h	12 Nov 2003 17:19:07 -0000
@@ -32,7 +32,7 @@
  */
 
 extern int __ipsec_errcode;
-extern void __ipsec_set_strerror __P((const char *));
+extern void __ipsec_set_strerror (const char *);
 
 #define EIPSEC_NO_ERROR		0	/*success*/
 #define EIPSEC_NOT_SUPPORTED	1	/*not supported*/
Index: lib/libipsec/libpfkey.h
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/libpfkey.h,v
retrieving revision 1.2
diff -u -r1.2 libpfkey.h
--- lib/libipsec/libpfkey.h	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/libpfkey.h	12 Nov 2003 17:19:07 -0000
@@ -32,60 +32,60 @@
  */
 
 struct sadb_msg;
-extern void pfkey_sadump __P((struct sadb_msg *));
-extern void pfkey_spdump __P((struct sadb_msg *));
+extern void pfkey_sadump (struct sadb_msg *);
+extern void pfkey_spdump (struct sadb_msg *);
 
 struct sockaddr;
 struct sadb_alg;
-int ipsec_check_keylen __P((u_int, u_int, u_int));
-int ipsec_check_keylen2 __P((u_int, u_int, u_int));
-int ipsec_get_keylen __P((u_int, u_int, struct sadb_alg *));
-u_int pfkey_set_softrate __P((u_int, u_int));
-u_int pfkey_get_softrate __P((u_int));
-int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *,
+int ipsec_check_keylen (u_int, u_int, u_int);
+int ipsec_check_keylen2 (u_int, u_int, u_int);
+int ipsec_get_keylen (u_int, u_int, struct sadb_alg *);
+u_int pfkey_set_softrate (u_int, u_int);
+u_int pfkey_get_softrate (u_int);
+int pfkey_send_getspi (int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
+int pfkey_send_update (int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
 	u_int64_t, u_int64_t, u_int32_t));
-int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
+int pfkey_send_add (int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int,
 	caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t,
 	u_int64_t, u_int64_t, u_int32_t));
-int pfkey_send_delete __P((int, u_int, u_int,
+int pfkey_send_delete (int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *, u_int32_t));
-int pfkey_send_delete_all __P((int, u_int, u_int,
+int pfkey_send_delete_all (int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *));
-int pfkey_send_get __P((int, u_int, u_int,
+int pfkey_send_get (int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *, u_int32_t));
-int pfkey_send_register __P((int, u_int));
-int pfkey_recv_register __P((int));
-int pfkey_set_supported __P((struct sadb_msg *, int));
-int pfkey_send_flush __P((int, u_int));
-int pfkey_send_dump __P((int, u_int));
-int pfkey_send_promisc_toggle __P((int, int));
-int pfkey_send_spdadd __P((int, struct sockaddr *, u_int,
+int pfkey_send_register (int, u_int);
+int pfkey_recv_register (int);
+int pfkey_set_supported (struct sadb_msg *, int);
+int pfkey_send_flush (int, u_int);
+int pfkey_send_dump (int, u_int);
+int pfkey_send_promisc_toggle (int, int);
+int pfkey_send_spdadd (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int,
+int pfkey_send_spdadd2 (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
 	caddr_t, int, u_int32_t));
-int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int,
+int pfkey_send_spdupdate (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int,
+int pfkey_send_spdupdate2 (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
 	caddr_t, int, u_int32_t));
-int pfkey_send_spddelete __P((int, struct sockaddr *, u_int,
+int pfkey_send_spddelete (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spddelete2 __P((int, u_int32_t));
-int pfkey_send_spdget __P((int, u_int32_t));
-int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int,
+int pfkey_send_spddelete2 (int, u_int32_t);
+int pfkey_send_spdget (int, u_int32_t);
+int pfkey_send_spdsetidx (int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t));
-int pfkey_send_spdflush __P((int));
-int pfkey_send_spddump __P((int));
+int pfkey_send_spdflush (int);
+int pfkey_send_spddump (int);
 
-int pfkey_open __P((void));
-void pfkey_close __P((int));
-struct sadb_msg *pfkey_recv __P((int));
-int pfkey_send __P((int, struct sadb_msg *, int));
-int pfkey_align __P((struct sadb_msg *, caddr_t *));
-int pfkey_check __P((caddr_t *));
+int pfkey_open (void);
+void pfkey_close (int);
+struct sadb_msg *pfkey_recv (int);
+int pfkey_send (int, struct sadb_msg *, int);
+int pfkey_align (struct sadb_msg *, caddr_t *);
+int pfkey_check (caddr_t *);
Index: lib/libipsec/pfkey.c
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/pfkey.c,v
retrieving revision 1.2
diff -u -r1.2 pfkey.c
--- lib/libipsec/pfkey.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/pfkey.c	12 Nov 2003 17:19:07 -0000
@@ -50,31 +50,31 @@
 
 #define CALLOC(size, cast) (cast)calloc(1, (size))
 
-static int findsupportedmap __P((int));
-static int setsupportedmap __P((struct sadb_supported *));
-static struct sadb_alg *findsupportedalg __P((u_int, u_int));
-static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *,
+static int findsupportedmap (int);
+static int setsupportedmap (struct sadb_supported *);
+static struct sadb_alg *findsupportedalg (u_int, u_int);
+static int pfkey_send_x1 (int, u_int, u_int, u_int, struct sockaddr *,
 	struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
 	u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
 	u_int32_t, u_int32_t, u_int32_t));
-static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
+static int pfkey_send_x2 (int, u_int, u_int, u_int,
 	struct sockaddr *, struct sockaddr *, u_int32_t));
-static int pfkey_send_x3 __P((int, u_int, u_int));
-static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int,
+static int pfkey_send_x3 (int, u_int, u_int);
+static int pfkey_send_x4 (int, u_int, struct sockaddr *, u_int,
 	struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
 	char *, int, u_int32_t));
-static int pfkey_send_x5 __P((int, u_int, u_int32_t));
+static int pfkey_send_x5 (int, u_int, u_int32_t);
 
-static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int,
+static caddr_t pfkey_setsadbmsg (caddr_t, caddr_t, u_int, u_int,
 	u_int, u_int32_t, pid_t));
-static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int,
+static caddr_t pfkey_setsadbsa (caddr_t, caddr_t, u_int32_t, u_int,
 	u_int, u_int, u_int32_t));
-static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int,
+static caddr_t pfkey_setsadbaddr (caddr_t, caddr_t, u_int,
 	struct sockaddr *, u_int, u_int));
-static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int));
-static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
+static caddr_t pfkey_setsadbkey (caddr_t, caddr_t, u_int, caddr_t, u_int);
+static caddr_t pfkey_setsadblifetime (caddr_t, caddr_t, u_int, u_int32_t,
 	u_int32_t, u_int32_t, u_int32_t));
-static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
+static caddr_t pfkey_setsadbxsa2 (caddr_t, caddr_t, u_int32_t, u_int32_t);
 
 /*
  * make and search supported algorithm structure.
Index: lib/libipsec/pfkey_dump.c
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/pfkey_dump.c,v
retrieving revision 1.2
diff -u -r1.2 pfkey_dump.c
--- lib/libipsec/pfkey_dump.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/pfkey_dump.c	12 Nov 2003 17:19:07 -0000
@@ -100,10 +100,10 @@
 		printf("%d ", (num)); \
 } while (0)
 
-static char *str_ipaddr __P((struct sockaddr *));
-static char *str_prefport __P((u_int, u_int, u_int));
-static char *str_time __P((time_t));
-static void str_lifetime_byte __P((struct sadb_lifetime *, char *));
+static char *str_ipaddr (struct sockaddr *);
+static char *str_prefport (u_int, u_int, u_int);
+static char *str_time (time_t);
+static void str_lifetime_byte (struct sadb_lifetime *, char *);
 
 struct val2str {
 	int val;
Index: lib/libipsec/policy_parse.y
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/policy_parse.y,v
retrieving revision 1.2
diff -u -r1.2 policy_parse.y
--- lib/libipsec/policy_parse.y	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/policy_parse.y	12 Nov 2003 17:20:07 -0000
@@ -76,18 +76,18 @@
 static struct sockaddr *p_dst = NULL;
 
 struct _val;
-extern void yyerror __P((char *msg));
-static struct sockaddr *parse_sockaddr __P((struct _val *buf));
-static int rule_check __P((void));
-static int init_x_policy __P((void));
-static int set_x_request __P((struct sockaddr *src, struct sockaddr *dst));
-static int set_sockaddr __P((struct sockaddr *addr));
-static void policy_parse_request_init __P((void));
-static caddr_t policy_parse __P((char *msg, int msglen));
+extern void yyerror (char *msg);
+static struct sockaddr *parse_sockaddr (struct _val *buf);
+static int rule_check (void);
+static int init_x_policy (void);
+static int set_x_request (struct sockaddr *src, struct sockaddr *dst);
+static int set_sockaddr (struct sockaddr *addr);
+static void policy_parse_request_init (void);
+static caddr_t policy_parse (char *msg, int msglen);
 
-extern void __policy__strbuffer__init__ __P((char *msg));
-extern int yyparse __P((void));
-extern int yylex __P((void));
+extern void __policy__strbuffer__init__ (char *msg);
+extern int yyparse (void);
+extern int yylex (void);
 
 %}
 
Index: lib/libipsec/policy_token.l
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/policy_token.l,v
retrieving revision 1.2
diff -u -r1.2 policy_token.l
--- lib/libipsec/policy_token.l	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/policy_token.l	12 Nov 2003 17:20:11 -0000
@@ -54,7 +54,7 @@
 #endif
 #define yylval __libipsecyylval	/* XXX */
 
-int yylex __P((void));
+int yylex (void);
 %}
 
 %option noyywrap
@@ -133,7 +133,7 @@
 
 %%
 
-void __policy__strbuffer__init__ __P((char *));
+void __policy__strbuffer__init__ (char *);
 
 void
 __policy__strbuffer__init__(msg)
Index: lib/libipsec/test-policy.c
===================================================================
RCS file: /home/dcvs/src/lib/libipsec/test-policy.c,v
retrieving revision 1.2
diff -u -r1.2 test-policy.c
--- lib/libipsec/test-policy.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libipsec/test-policy.c	12 Nov 2003 17:19:07 -0000
@@ -85,11 +85,11 @@
 { 0, "out ipsec esp/transport/fec0::10-fec0::11/use" },
 };
 
-int test1 __P((void));
-int test1sub1 __P((struct req_t *));
-int test1sub2 __P((char *, int));
-int test2 __P((void));
-int test2sub __P((int));
+int test1 (void);
+int test1sub1 (struct req_t *);
+int test1sub2 (char *, int);
+int test2 (void);
+int test2sub (int);
 
 int
 main(ac, av)
Index: lib/libkvm/kvm.c
===================================================================
RCS file: /home/dcvs/src/lib/libkvm/kvm.c,v
retrieving revision 1.2
diff -u -r1.2 kvm.c
--- lib/libkvm/kvm.c	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libkvm/kvm.c	12 Nov 2003 17:19:07 -0000
@@ -67,7 +67,7 @@
 #include "kvm_private.h"
 
 /* from src/lib/libc/gen/nlist.c */
-int __fdnlist		__P((int, struct nlist *));
+int __fdnlist		(int, struct nlist *);
 
 char *
 kvm_geterr(kd)
Index: lib/libkvm/kvm.h
===================================================================
RCS file: /home/dcvs/src/lib/libkvm/kvm.h,v
retrieving revision 1.3
diff -u -r1.3 kvm.h
--- lib/libkvm/kvm.h	9 Nov 2003 02:34:02 -0000	1.3
+++ lib/libkvm/kvm.h	12 Nov 2003 17:19:07 -0000
@@ -64,24 +64,24 @@
 #define SWIF_DEV_PREFIX	0x0002
 
 __BEGIN_DECLS
-int	  kvm_close __P((kvm_t *));
-char	**kvm_getargv __P((kvm_t *, const struct kinfo_proc *, int));
-char	**kvm_getenvv __P((kvm_t *, const struct kinfo_proc *, int));
-char	 *kvm_geterr __P((kvm_t *));
-char	 *kvm_getfiles __P((kvm_t *, int, int, int *));
-int	  kvm_getloadavg __P((kvm_t *, double [], int));
+int	  kvm_close (kvm_t *);
+char	**kvm_getargv (kvm_t *, const struct kinfo_proc *, int);
+char	**kvm_getenvv (kvm_t *, const struct kinfo_proc *, int);
+char	 *kvm_geterr (kvm_t *);
+char	 *kvm_getfiles (kvm_t *, int, int, int *);
+int	  kvm_getloadavg (kvm_t *, double [], int);
 struct kinfo_proc *
-	  kvm_getprocs __P((kvm_t *, int, int, int *));
-int	  kvm_getswapinfo __P((kvm_t *, struct kvm_swap *, int, int));
-int	  kvm_nlist __P((kvm_t *, struct nlist *));
+	  kvm_getprocs (kvm_t *, int, int, int *);
+int	  kvm_getswapinfo (kvm_t *, struct kvm_swap *, int, int);
+int	  kvm_nlist (kvm_t *, struct nlist *);
 kvm_t	 *kvm_open
-	    __P((const char *, const char *, const char *, int, const char *));
+	    (const char *, const char *, const char *, int, const char *);
 kvm_t	 *kvm_openfiles
-	    __P((const char *, const char *, const char *, int, char *));
-__ssize_t	  kvm_read __P((kvm_t *, unsigned long, void *, __size_t));
+	    (const char *, const char *, const char *, int, char *);
+__ssize_t	  kvm_read (kvm_t *, unsigned long, void *, __size_t);
 __ssize_t	  kvm_uread
-	    __P((kvm_t *, const struct proc *, unsigned long, char *, __size_t));
-__ssize_t	  kvm_write __P((kvm_t *, unsigned long, const void *, __size_t));
+	    (kvm_t *, const struct proc *, unsigned long, char *, __size_t);
+__ssize_t	  kvm_write (kvm_t *, unsigned long, const void *, __size_t);
 __END_DECLS
 
 #endif /* !_KVM_H_ */
Index: lib/libkvm/kvm_private.h
===================================================================
RCS file: /home/dcvs/src/lib/libkvm/kvm_private.h,v
retrieving revision 1.2
diff -u -r1.2 kvm_private.h
--- lib/libkvm/kvm_private.h	17 Jun 2003 04:26:49 -0000	1.2
+++ lib/libkvm/kvm_private.h	12 Nov 2003 17:19:07 -0000
@@ -71,13 +71,13 @@
 /*
  * Functions used internally by kvm, but across kvm modules.
  */
-void	 _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...));
-void	 _kvm_freeprocs __P((kvm_t *kd));
-void	 _kvm_freevtop __P((kvm_t *));
-int	 _kvm_initvtop __P((kvm_t *));
-int	 _kvm_kvatop __P((kvm_t *, u_long, u_long *));
-void	*_kvm_malloc __P((kvm_t *kd, size_t));
-void	*_kvm_realloc __P((kvm_t *kd, void *, size_t));
+void	 _kvm_err (kvm_t *kd, const char *program, const char *fmt, ...);
+void	 _kvm_freeprocs (kvm_t *kd);
+void	 _kvm_freevtop (kvm_t *);
+int	 _kvm_initvtop (kvm_t *);
+int	 _kvm_kvatop (kvm_t *, u_long, u_long *);
+void	*_kvm_malloc (kvm_t *kd, size_t);
+void	*_kvm_realloc (kvm_t *kd, void *, size_t);
 void	 _kvm_syserr
-	    __P((kvm_t *kd, const char *program, const char *fmt, ...));
-int	 _kvm_uvatop __P((kvm_t *, const struct proc *, u_long, u_long *));
+	    (kvm_t *kd, const char *program, const char *fmt, ...);
+int	 _kvm_uvatop (kvm_t *, const struct proc *, u_long, u_long *);
Index: lib/libm/common_source/gamma.c
===================================================================
RCS file: /home/dcvs/src/lib/libm/common_source/gamma.c,v
retrieving revision 1.2
diff -u -r1.2 gamma.c
--- lib/libm/common_source/gamma.c	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libm/common_source/gamma.c	12 Nov 2003 17:19:07 -0000
@@ -74,11 +74,11 @@
  *	Maximum observed error < 4ulp in 1,000,000 trials.
  */
 
-static double neg_gam __P((double));
-static double small_gam __P((double));
-static double smaller_gam __P((double));
-static struct Double large_gam __P((double));
-static struct Double ratfun_gam __P((double, double));
+static double neg_gam (double);
+static double small_gam (double);
+static double smaller_gam (double);
+static struct Double large_gam (double);
+static struct Double ratfun_gam (double, double);
 
 /*
  * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval
Index: lib/libm/common_source/j0.c
===================================================================
RCS file: /home/dcvs/src/lib/libm/common_source/j0.c,v
retrieving revision 1.2
diff -u -r1.2 j0.c
--- lib/libm/common_source/j0.c	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libm/common_source/j0.c	12 Nov 2003 17:19:48 -0000
@@ -117,7 +117,7 @@
 #define infnan(x) (0.0)
 #endif
 
-static double pzero __P((double)), qzero __P((double));
+static double pzero (double), qzero (double);
 
 static double
 huge 	= 1e300,
Index: lib/libm/common_source/mathimpl.h
===================================================================
RCS file: /home/dcvs/src/lib/libm/common_source/mathimpl.h,v
retrieving revision 1.1
diff -u -r1.1 mathimpl.h
--- lib/libm/common_source/mathimpl.h	17 Jun 2003 02:51:30 -0000	1.1
+++ lib/libm/common_source/mathimpl.h	12 Nov 2003 17:19:07 -0000
@@ -94,5 +94,5 @@
 extern double	__log__L();
 
 struct Double {double a, b;};
-double __exp__D __P((double, double));
-struct Double __log__D __P((double));
+double __exp__D (double, double);
+struct Double __log__D (double);
Index: lib/libm/common_source/pow.c
===================================================================
RCS file: /home/dcvs/src/lib/libm/common_source/pow.c,v
retrieving revision 1.2
diff -u -r1.2 pow.c
--- lib/libm/common_source/pow.c	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libm/common_source/pow.c	12 Nov 2003 17:19:07 -0000
@@ -119,7 +119,7 @@
 
 const static double zero=0.0, one=1.0, two=2.0, negone= -1.0;
 
-static double pow_P __P((double, double));
+static double pow_P (double, double);
 
 double pow(x,y)
 double x,y;
Index: lib/libmd/md5c.c
===================================================================
RCS file: /home/dcvs/src/lib/libmd/md5c.c,v
retrieving revision 1.2
diff -u -r1.2 md5c.c
--- lib/libmd/md5c.c	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libmd/md5c.c	12 Nov 2003 17:19:07 -0000
@@ -39,7 +39,7 @@
 
 #include <sys/md5.h>
 
-static void MD5Transform __P((u_int32_t [4], const unsigned char [64]));
+static void MD5Transform (u_int32_t [4], const unsigned char [64]);
 
 #ifdef _KERNEL
 #define memset(x,y,z)	bzero(x,z);
Index: lib/libncp/ipx.c
===================================================================
RCS file: /home/dcvs/src/lib/libncp/ipx.c,v
retrieving revision 1.2
diff -u -r1.2 ipx.c
--- lib/libncp/ipx.c	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libncp/ipx.c	12 Nov 2003 17:51:57 -0000
@@ -185,9 +185,9 @@
 }
 
 
-static void	rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *));
-static int	if_ipxscan __P((int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm,
-		    struct ifa_msghdr *ifam,struct ipx_addr *addr));
+static void	rt_xaddrs (caddr_t, caddr_t, struct rt_addrinfo *);
+static int	if_ipxscan (int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm,
+		    struct ifa_msghdr *ifam,struct ipx_addr *addr);
 
 /*
  * Find an IPX interface. 
Index: lib/libncp/ncp_mod.h
===================================================================
RCS file: /home/dcvs/src/lib/libncp/ncp_mod.h,v
retrieving revision 1.2
diff -u -r1.2 ncp_mod.h
--- lib/libncp/ncp_mod.h	17 Jun 2003 04:26:50 -0000	1.2
+++ lib/libncp/ncp_mod.h	12 Nov 2003 17:19:08 -0000
@@ -14,4 +14,4 @@
 #define	NCP_INTFN		NCP_SE(2)
 #define	SNCP_REQUEST		NCP_SE(3)
 
-#endif /* !_NCP_MOD_H_ */
\ No newline at end of file
+#endif /* !_NCP_MOD_H_ */
Index: lib/librpcsvc/secretkey.c
===================================================================
RCS file: /home/dcvs/src/lib/librpcsvc/secretkey.c,v
retrieving revision 1.2
diff -u -r1.2 secretkey.c
--- lib/librpcsvc/secretkey.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/librpcsvc/secretkey.c	12 Nov 2003 17:19:08 -0000
@@ -46,7 +46,7 @@
 #include <rpcsvc/ypclnt.h>
 #include <string.h>
 
-extern int xdecrypt __P(( char *, char * ));
+extern int xdecrypt ( char *, char * );
 
 /*
  * Get somebody's encrypted secret key from the database, using the given
Index: lib/librpcsvc/xcrypt.c
===================================================================
RCS file: /home/dcvs/src/lib/librpcsvc/xcrypt.c,v
retrieving revision 1.2
diff -u -r1.2 xcrypt.c
--- lib/librpcsvc/xcrypt.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/librpcsvc/xcrypt.c	12 Nov 2003 17:19:08 -0000
@@ -43,10 +43,10 @@
 #include <rpc/des_crypt.h>
 
 static char hex[];	/* forward */
-static char hexval __P(( char ));
-static void bin2hex __P(( int, unsigned char *, char * ));
-static void hex2bin __P(( int, char *, char * ));
-void passwd2des __P(( char *, char * ));
+static char hexval ( char );
+static void bin2hex ( int, unsigned char *, char * );
+static void hex2bin ( int, char *, char * );
+void passwd2des ( char *, char * );
 
 /*
  * Encrypt a secret key given passwd
Index: lib/libskey/put.c
===================================================================
RCS file: /home/dcvs/src/lib/libskey/put.c,v
retrieving revision 1.1
diff -u -r1.1 put.c
--- lib/libskey/put.c	17 Jun 2003 02:51:36 -0000	1.1
+++ lib/libskey/put.c	12 Nov 2003 17:19:09 -0000
@@ -4,10 +4,10 @@
 #include <ctype.h>
 #include "skey.h"
 
-static unsigned long extract __P((char *s,int start,int length));
-static void standard __P((char *word));
-static void insert __P((char *s, int x, int start, int length));
-static int wsrch __P((char *w,int low,int high));
+static unsigned long extract (char *s,int start,int length);
+static void standard (char *word);
+static void insert (char *s, int x, int start, int length);
+static int wsrch (char *w,int low,int high);
 
 /* Dictionary for integer-word translations */
 static char Wp[2048][4] = {
Index: lib/libskey/skey.h
===================================================================
RCS file: /home/dcvs/src/lib/libskey/skey.h,v
retrieving revision 1.1
diff -u -r1.1 skey.h
--- lib/libskey/skey.h	17 Jun 2003 02:51:36 -0000	1.1
+++ lib/libskey/skey.h	12 Nov 2003 17:19:09 -0000
@@ -34,27 +34,27 @@
 #define rip             _sk_rip
 #define sevenbit        _sk_sevenbit
 
-void f __P((char *x));
-int keycrunch __P((char *result,const char *seed,const char *passwd));
-char *btoe __P((char *engout,char *c));
-char *put8 __P((char *out,char *s));
-int atob8 __P((char *out, char *in));
-int btoa8 __P((char *out, char *in));
-int htoi __P((char c));
-int etob __P((char *out,char *e));
-void sevenbit __P((char *s));
-char *readpass __P((char *buf, int n));
-void rip __P((char *buf));
+void f (char *x);
+int keycrunch (char *result,const char *seed,const char *passwd);
+char *btoe (char *engout,char *c);
+char *put8 (char *out,char *s);
+int atob8 (char *out, char *in);
+int btoa8 (char *out, char *in);
+int htoi (char c);
+int etob (char *out,char *e);
+void sevenbit (char *s);
+char *readpass (char *buf, int n);
+void rip (char *buf);
 #endif  /* _SKEY_INTERNAL */
 
 /* Simplified application programming interface. */
 #include <pwd.h>
-int skeylookup __P((struct skey *mp, const char *name));
-int skeyverify __P((struct skey *mp, char *response));
-int skeychallenge __P((struct skey *mp, const char *name, char *challenge));
-int skeyinfo __P((struct skey *mp, const char* name, char *ss));
-int skeyaccess __P((char *user, const char *port, const char *host, const char *addr));
-char *skey_getpass __P((const char *prompt, struct passwd * pwd, int pwok));
-const char *skey_crypt __P((char *pp, char *salt, struct passwd *pwd, int pwok));
+int skeylookup (struct skey *mp, const char *name);
+int skeyverify (struct skey *mp, char *response);
+int skeychallenge (struct skey *mp, const char *name, char *challenge);
+int skeyinfo (struct skey *mp, const char* name, char *ss);
+int skeyaccess (char *user, const char *port, const char *host, const char *addr);
+char *skey_getpass (const char *prompt, struct passwd * pwd, int pwok);
+const char *skey_crypt (char *pp, char *salt, struct passwd *pwd, int pwok);
 
 #endif /* _SKEY_H_ */
Index: lib/libskey/skeyaccess.c
===================================================================
RCS file: /home/dcvs/src/lib/libskey/skeyaccess.c,v
retrieving revision 1.2
diff -u -r1.2 skeyaccess.c
--- lib/libskey/skeyaccess.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libskey/skeyaccess.c	12 Nov 2003 17:19:09 -0000
@@ -49,12 +49,12 @@
   */
 static char *prev_token = 0;		/* push-back buffer */
 static char *line_pointer = NULL;
-static char *first_token __P((char *, int, FILE *));
+static char *first_token (char *, int, FILE *);
 static int line_number;
-static void unget_token __P((char *));
-static char *get_token __P((void));
-static char *need_token __P((void));
-static char *need_internet_addr __P((void));
+static void unget_token (char *);
+static char *get_token (void);
+static char *need_token (void);
+static char *need_internet_addr (void);
 
  /*
   * Various forms of token matching.
@@ -63,12 +63,12 @@
 #define match_port(l)		match_token((l)->port)
 #define match_user(l)		match_token((l)->user)
 struct login_info;
-static int match_internet_addr __P((struct login_info *));
-static int match_group __P((struct login_info *));
-static int match_token __P((char *));
-static int is_internet_addr __P((char *));
-static struct addrinfo *convert_internet_addr __P((char *));
-static struct addrinfo *lookup_internet_addr __P((char *));
+static int match_internet_addr (struct login_info *);
+static int match_group (struct login_info *);
+static int match_token (char *);
+static int is_internet_addr (char *);
+static struct addrinfo *convert_internet_addr (char *);
+static struct addrinfo *lookup_internet_addr (char *);
 
 #define MAX_ADDR	32
 #define PERMIT		1
@@ -88,8 +88,8 @@
     char   *port;			/* login port */
 };
 
-static int _skeyaccess __P((FILE *, struct login_info *));
-int skeyaccess __P((char *, char *, char *, char *));
+static int _skeyaccess (FILE *, struct login_info *);
+int skeyaccess (char *, char *, char *, char *);
 
 /* skeyaccess - find out if UNIX passwords are permitted */
 
Index: lib/libskey/skeylogin.c
===================================================================
RCS file: /home/dcvs/src/lib/libskey/skeylogin.c,v
retrieving revision 1.2
diff -u -r1.2 skeylogin.c
--- lib/libskey/skeylogin.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libskey/skeylogin.c	12 Nov 2003 17:19:09 -0000
@@ -23,7 +23,7 @@
 #include "skey.h"
 #include "pathnames.h"
 
-static char *skipspace __P((char *));
+static char *skipspace (char *);
 
 #define setpriority(x,y,z)	/* nothing */
 
Index: lib/libskey/skeysubr.c
===================================================================
RCS file: /home/dcvs/src/lib/libskey/skeysubr.c,v
retrieving revision 1.2
diff -u -r1.2 skeysubr.c
--- lib/libskey/skeysubr.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libskey/skeysubr.c	12 Nov 2003 17:19:09 -0000
@@ -76,7 +76,7 @@
 
 static struct termios saved_ttymode;
 
-static void interrupt __P((int));
+static void interrupt (int);
 
 static void interrupt(sig)
 int sig;
@@ -91,7 +91,7 @@
 int n;
 {
 	struct termios noecho_ttymode;
-	void (*oldsig) __P((int));
+	void (*oldsig) (int);
 
 	/* Save normal line editing modes */
 	tcgetattr(0, &saved_ttymode);
Index: lib/libstand/quad.h
===================================================================
RCS file: /home/dcvs/src/lib/libstand/quad.h,v
retrieving revision 1.2
diff -u -r1.2 quad.h
--- lib/libstand/quad.h	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libstand/quad.h	12 Nov 2003 17:19:09 -0000
@@ -98,11 +98,11 @@
 #define	LHALF(x)	((x) & ((1 << HALF_BITS) - 1))
 #define	LHUP(x)		((x) << HALF_BITS)
 
-quad_t		__divdi3 __P((quad_t a, quad_t b));
-quad_t		__moddi3 __P((quad_t a, quad_t b));
-u_quad_t	__qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem));
-u_quad_t	__udivdi3 __P((u_quad_t a, u_quad_t b));
-u_quad_t	__umoddi3 __P((u_quad_t a, u_quad_t b));
+quad_t		__divdi3 (quad_t a, quad_t b);
+quad_t		__moddi3 (quad_t a, quad_t b);
+u_quad_t	__qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem);
+u_quad_t	__udivdi3 (u_quad_t a, u_quad_t b);
+u_quad_t	__umoddi3 (u_quad_t a, u_quad_t b);
 
 /*
  * XXX
Index: lib/libutil/fparseln.c
===================================================================
RCS file: /home/dcvs/src/lib/libutil/fparseln.c,v
retrieving revision 1.2
diff -u -r1.2 fparseln.c
--- lib/libutil/fparseln.c	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libutil/fparseln.c	12 Nov 2003 17:19:09 -0000
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <libutil.h>
 
-static int isescaped __P((const char *, const char *, int));
+static int isescaped (const char *, const char *, int);
 
 /* isescaped():
  *	Return true if the character in *p that belongs to a string
@@ -202,7 +202,7 @@
 
 #ifdef TEST
 
-int main __P((int, char **));
+int main (int, char **);
 
 int
 main(argc, argv)
Index: lib/libutil/libutil.h
===================================================================
RCS file: /home/dcvs/src/lib/libutil/libutil.h,v
retrieving revision 1.2
diff -u -r1.2 libutil.h
--- lib/libutil/libutil.h	17 Jun 2003 04:26:51 -0000	1.2
+++ lib/libutil/libutil.h	12 Nov 2003 17:20:49 -0000
@@ -49,30 +49,30 @@
 struct in_addr;
 
 __BEGIN_DECLS
-void	login __P((struct utmp *_ut));
-int	login_tty __P((int _fd));
-int	logout __P((const char *_line));
-void	logwtmp __P((const char *_line, const char *_name, const char *_host));
-void	trimdomain __P((char *_fullhost, int _hostsize));
-int	openpty __P((int *_amaster, int *_aslave, char *_name,
-		     struct termios *_termp, struct winsize *_winp));
-int	forkpty __P((int *_amaster, char *_name,
-		     struct termios *_termp, struct winsize *_winp));
-const char *uu_lockerr __P((int _uu_lockresult));
-int	uu_lock __P((const char *_ttyname));
-int	uu_unlock __P((const char *_ttyname));
-int	uu_lock_txfr __P((const char *_ttyname, pid_t _pid));
-int	_secure_path __P((const char *_path, uid_t _uid, gid_t _gid));
-properties properties_read __P((int fd));
-void	properties_free __P((properties list));
-char	*property_find __P((properties list, const char *name));
-char	*auth_getval __P((const char *name));
-int	realhostname __P((char *host, size_t hsize, const struct in_addr *ip));
+void	login (struct utmp *_ut);
+int	login_tty (int _fd);
+int	logout (const char *_line);
+void	logwtmp (const char *_line, const char *_name, const char *_host);
+void	trimdomain (char *_fullhost, int _hostsize);
+int	openpty (int *_amaster, int *_aslave, char *_name,
+		     struct termios *_termp, struct winsize *_winp);
+int	forkpty (int *_amaster, char *_name,
+		     struct termios *_termp, struct winsize *_winp);
+const char *uu_lockerr (int _uu_lockresult);
+int	uu_lock (const char *_ttyname);
+int	uu_unlock (const char *_ttyname);
+int	uu_lock_txfr (const char *_ttyname, pid_t _pid);
+int	_secure_path (const char *_path, uid_t _uid, gid_t _gid);
+properties properties_read (int fd);
+void	properties_free (properties list);
+char	*property_find (properties list, const char *name);
+char	*auth_getval (const char *name);
+int	realhostname (char *host, size_t hsize, const struct in_addr *ip);
 struct sockaddr;
-int	realhostname_sa __P((char *host, size_t hsize, struct sockaddr *addr,
-			     int addrlen));
+int	realhostname_sa (char *host, size_t hsize, struct sockaddr *addr,
+			     int addrlen);
 #ifdef _STDIO_H_	/* avoid adding new includes */
-char   *fparseln __P((FILE *, size_t *, size_t *, const char[3], int));
+char   *fparseln (FILE *, size_t *, size_t *, const char[3], int);
 #endif
 __END_DECLS
 
Index: lib/libutil/login_cap.h
===================================================================
RCS file: /home/dcvs/src/lib/libutil/login_cap.h,v
retrieving revision 1.2
diff -u -r1.2 login_cap.h
--- lib/libutil/login_cap.h	17 Jun 2003 04:26:52 -0000	1.2
+++ lib/libutil/login_cap.h	12 Nov 2003 17:19:09 -0000
@@ -97,61 +97,61 @@
 __BEGIN_DECLS
 struct passwd;
 
-void login_close __P((login_cap_t *));
-login_cap_t *login_getclassbyname __P((const char *, const struct passwd *));
-login_cap_t *login_getclass __P((const char *));
-login_cap_t *login_getpwclass __P((const struct passwd *));
-login_cap_t *login_getuserclass __P((const struct passwd *));
-
-char *login_getcapstr __P((login_cap_t*, const char *, char *, char *));
-char **login_getcaplist __P((login_cap_t *, const char *, const char *));
-char *login_getstyle __P((login_cap_t *, char *, const char *));
-rlim_t login_getcaptime __P((login_cap_t *, const char *, rlim_t, rlim_t));
-rlim_t login_getcapnum __P((login_cap_t *, const char *, rlim_t, rlim_t));
-rlim_t login_getcapsize __P((login_cap_t *, const char *, rlim_t, rlim_t));
-char *login_getpath __P((login_cap_t *, const char *, char *));
-int login_getcapbool __P((login_cap_t *, const char *, int));
-const char *login_setcryptfmt __P((login_cap_t *, const char *, const char *));
-
-int setclasscontext __P((const char*, unsigned int));
-int setusercontext __P((login_cap_t*, const struct passwd*, uid_t, unsigned int));
-void setclassresources __P((login_cap_t *));
-void setclassenvironment __P((login_cap_t *, const struct passwd *, int)+void login_close (login_cap_t *);
+login_cap_t *login_getclassbyname (const char *, const struct passwd *);
+login_cap_t *login_getclass (const char *);
+login_cap_t *login_getpwclass (const struct passwd *);
+login_cap_t *login_getuserclass (const struct passwd *);
+
+char *login_getcapstr (login_cap_t*, const char *, char *, char *);
+char **login_getcaplist (login_cap_t *, const char *, const char *);
+char *login_getstyle (login_cap_t *, char *, const char *);
+rlim_t login_getcaptime (login_cap_t *, const char *, rlim_t, rlim_t);
+rlim_t login_getcapnum (login_cap_t *, const char *, rlim_t, rlim_t);
+rlim_t login_getcapsize (login_cap_t *, const char *, rlim_t, rlim_t);
+char *login_getpath (login_cap_t *, const char *, char *);
+int login_getcapbool (login_cap_t *, const char *, int);
+const char *login_setcryptfmt (login_cap_t *, const char *, const char *);
+
+int setclasscontext (const char*, unsigned int);
+int setusercontext (login_cap_t*, const struct passwd*, uid_t, unsigned int);
+void setclassresources (login_cap_t *);
+void setclassenvironment (login_cap_t *, const struct passwd *, int);
 
 /* Most of these functions are deprecated */
-int auth_approve __P((login_cap_t*, const char*, const char*));
-int auth_check __P((const char *, const char *, const char *, const char *, int *));
-void auth_env __P((void));
-char *auth_mkvalue __P((const char *n));
-int auth_response __P((const char *, const char *, const char *, const char *, int *, const char *, const char *));
-void auth_rmfiles __P((void));
-int auth_scan __P((int));
-int auth_script __P((const char*, ...));
-int auth_script_data __P((const char *, int, const char *, ...));
-char *auth_valud __P((const char *));
-int auth_setopt __P((const char *, const char *));
-void auth_clropts __P((void));
-
-void auth_checknologin __P((login_cap_t*));
-int auth_cat __P((const char*));
-
-int auth_ttyok __P((login_cap_t*, const char *));
-int auth_hostok __P((login_cap_t*, const char *, char const *));
-int auth_timeok __P((login_cap_t*, time_t));
+int auth_approve (login_cap_t*, const char*, const char*);
+int auth_check (const char *, const char *, const char *, const char *, int *);
+void auth_env (void);
+char *auth_mkvalue (const char *n);
+int auth_response (const char *, const char *, const char *, const char *, int *, const char *, const char *);
+void auth_rmfiles (void);
+int auth_scan (int);
+int auth_script (const char*, ...);
+int auth_script_data (const char *, int, const char *, ...);
+char *auth_valud (const char *);
+int auth_setopt (const char *, const char *);
+void auth_clropts (void);
+
+void auth_checknologin (login_cap_t*);
+int auth_cat (const char*);
+
+int auth_ttyok (login_cap_t*, const char *);
+int auth_hostok (login_cap_t*, const char *, char const *);
+int auth_timeok (login_cap_t*, time_t);
 
 struct tm;
 
-login_time_t parse_lt __P((const char *));
-int in_ltm __P((const login_time_t *, struct tm *, time_t *));
-int in_ltms __P((const login_time_t *, struct tm *, time_t *));
+login_time_t parse_lt (const char *);
+int in_ltm (const login_time_t *, struct tm *, time_t *);
+int in_ltms (const login_time_t *, struct tm *, time_t *);
 
 /* helper functions */
 
-int login_strinlist __P((char **, char const *, int));
-int login_str2inlist __P((char **, const char *, const char *, int));
-login_time_t * login_timelist __P((login_cap_t *, char const *, int *, login_time_t **));
-int login_ttyok __P((login_cap_t *, const char *, const char *, const char *));
-int login_hostok __P((login_cap_t *, const char *, const char *, const char *, const char *));
+int login_strinlist (char **, char const *, int);
+int login_str2inlist (char **, const char *, const char *, int);
+login_time_t * login_timelist (login_cap_t *, char const *, int *, login_time_t **);
+int login_ttyok (login_cap_t *, const char *, const char *, const char *);
+int login_hostok (login_cap_t *, const char *, const char *, const char *, const char *);
 
 __END_DECLS
 
Index: lib/msun/src/get_hw_float.c
===================================================================
RCS file: /home/dcvs/src/lib/msun/src/get_hw_float.c,v
retrieving revision 1.2
diff -u -r1.2 get_hw_float.c
--- lib/msun/src/get_hw_float.c	17 Jun 2003 04:26:53 -0000	1.2
+++ lib/msun/src/get_hw_float.c	12 Nov 2003 17:19:11 -0000
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
-int	__get_hw_float __P((void));
+int	__get_hw_float (void);
 
 static int	hw_float = -1;
 
Index: lib/msun/src/math.h
===================================================================
RCS file: /home/dcvs/src/lib/msun/src/math.h,v
retrieving revision 1.2
diff -u -r1.2 math.h
--- lib/msun/src/math.h	17 Jun 2003 04:26:53 -0000	1.2
+++ lib/msun/src/math.h	12 Nov 2003 17:19:11 -0000
@@ -102,164 +102,164 @@
 /*
  * ANSI/POSIX
  */
-extern double acos __P((double));
-extern double asin __P((double));
-extern double atan __P((double));
-extern double atan2 __P((double, double));
-extern double cos __P((double));
-extern double sin __P((double));
-extern double tan __P((double));
-
-extern double cosh __P((double));
-extern double sinh __P((double));
-extern double tanh __P((double));
-
-extern double exp __P((double));
-extern double frexp __P((double, int *));
-extern double ldexp __P((double, int));
-extern double log __P((double));
-extern double log10 __P((double));
-extern double modf __P((double, double *));
-
-extern double pow __P((double, double));
-extern double sqrt __P((double));
-
-extern double ceil __P((double));
-extern double fabs __P((double));
-extern double floor __P((double));
-extern double fmod __P((double, double));
+extern double acos (double);
+extern double asin (double);
+extern double atan (double);
+extern double atan2 (double, double);
+extern double cos (double);
+extern double sin (double);
+extern double tan (double);
+
+extern double cosh (double);
+extern double sinh (double);
+extern double tanh (double);
+
+extern double exp (double);
+extern double frexp (double, int *);
+extern double ldexp (double, int);
+extern double log (double);
+extern double log10 (double);
+extern double modf (double, double *);
+
+extern double pow (double, double);
+extern double sqrt (double);
+
+extern double ceil (double);
+extern double fabs (double);
+extern double floor (double);
+extern double fmod (double, double);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-extern double erf __P((double));
-extern double erfc __P((double));
-extern double gamma __P((double));
-extern double hypot __P((double, double));
-extern int isinf __P((double));
-extern int isnan __P((double));
-extern int finite __P((double));
-extern double j0 __P((double));
-extern double j1 __P((double));
-extern double jn __P((int, double));
-extern double lgamma __P((double));
-extern double y0 __P((double));
-extern double y1 __P((double));
-extern double yn __P((int, double));
+extern double erf (double);
+extern double erfc (double);
+extern double gamma (double);
+extern double hypot (double, double);
+extern int isinf (double);
+extern int isnan (double);
+extern int finite (double);
+extern double j0 (double);
+extern double j1 (double);
+extern double jn (int, double);
+extern double lgamma (double);
+extern double y0 (double);
+extern double y1 (double);
+extern double yn (int, double);
 
 #if !defined(_XOPEN_SOURCE)
-extern double acosh __P((double));
-extern double asinh __P((double));
-extern double atanh __P((double));
-extern double cbrt __P((double));
-extern double logb __P((double));
-extern double nextafter __P((double, double));
-extern double remainder __P((double, double));
-extern double scalb __P((double, double));
+extern double acosh (double);
+extern double asinh (double);
+extern double atanh (double);
+extern double cbrt (double);
+extern double logb (double);
+extern double nextafter (double, double);
+extern double remainder (double, double);
+extern double scalb (double, double);
 
 #ifndef __cplusplus
-extern int matherr __P((struct exception *));
+extern int matherr (struct exception *);
 #endif
 
 /*
  * IEEE Test Vector
  */
-extern double significand __P((double));
+extern double significand (double);
 
 /*
  * Functions callable from C, intended to support IEEE arithmetic.
  */
-extern double copysign __P((double, double));
-extern int ilogb __P((double));
-extern double rint __P((double));
-extern double scalbn __P((double, int));
+extern double copysign (double, double);
+extern int ilogb (double);
+extern double rint (double);
+extern double scalbn (double, int);
 
 /*
  * BSD math library entry points
  */
-extern double drem __P((double, double));
-extern double expm1 __P((double));
-extern double log1p __P((double));
+extern double drem (double, double);
+extern double expm1 (double);
+extern double log1p (double);
 
 /*
  * Reentrant version of gamma & lgamma; passes signgam back by reference
  * as the second argument; user must allocate space for signgam.
  */
 #ifdef _REENTRANT
-extern double gamma_r __P((double, int *));
-extern double lgamma_r __P((double, int *));
+extern double gamma_r (double, int *);
+extern double lgamma_r (double, int *);
 #endif /* _REENTRANT */
 
 
 /* float versions of ANSI/POSIX functions */
-extern float acosf __P((float));
-extern float asinf __P((float));
-extern float atanf __P((float));
-extern float atan2f __P((float, float));
-extern float cosf __P((float));
-extern float sinf __P((float));
-extern float tanf __P((float));
-
-extern float coshf __P((float));
-extern float sinhf __P((float));
-extern float tanhf __P((float));
-
-extern float expf __P((float));
-extern float frexpf __P((float, int *));
-extern float ldexpf __P((float, int));
-extern float logf __P((float));
-extern float log10f __P((float));
-extern float modff __P((float, float *));
-
-extern float powf __P((float, float));
-extern float sqrtf __P((float));
-
-extern float ceilf __P((float));
-extern float fabsf __P((float));
-extern float floorf __P((float));
-extern float fmodf __P((float, float));
-
-extern float erff __P((float));
-extern float erfcf __P((float));
-extern float gammaf __P((float));
-extern float hypotf __P((float, float));
-extern int isnanf __P((float));
-extern int finitef __P((float));
-extern float j0f __P((float));
-extern float j1f __P((float));
-extern float jnf __P((int, float));
-extern float lgammaf __P((float));
-extern float y0f __P((float));
-extern float y1f __P((float));
-extern float ynf __P((int, float));
-
-extern float acoshf __P((float));
-extern float asinhf __P((float));
-extern float atanhf __P((float));
-extern float cbrtf __P((float));
-extern float logbf __P((float));
-extern float nextafterf __P((float, float));
-extern float remainderf __P((float, float));
-extern float scalbf __P((float, float));
+extern float acosf (float);
+extern float asinf (float);
+extern float atanf (float);
+extern float atan2f (float, float);
+extern float cosf (float);
+extern float sinf (float);
+extern float tanf (float);
+
+extern float coshf (float);
+extern float sinhf (float);
+extern float tanhf (float);
+
+extern float expf (float);
+extern float frexpf (float, int *);
+extern float ldexpf (float, int);
+extern float logf (float);
+extern float log10f (float);
+extern float modff (float, float *);
+
+extern float powf (float, float);
+extern float sqrtf (float);
+
+extern float ceilf (float);
+extern float fabsf (float);
+extern float floorf (float);
+extern float fmodf (float, float);
+
+extern float erff (float);
+extern float erfcf (float);
+extern float gammaf (float);
+extern float hypotf (float, float);
+extern int isnanf (float);
+extern int finitef (float);
+extern float j0f (float);
+extern float j1f (float);
+extern float jnf (int, float);
+extern float lgammaf (float);
+extern float y0f (float);
+extern float y1f (float);
+extern float ynf (int, float);
+
+extern float acoshf (float);
+extern float asinhf (float);
+extern float atanhf (float);
+extern float cbrtf (float);
+extern float logbf (float);
+extern float nextafterf (float, float);
+extern float remainderf (float, float);
+extern float scalbf (float, float);
 
 /*
  * float version of IEEE Test Vector
  */
-extern float significandf __P((float));
+extern float significandf (float);
 
 /*
  * Float versions of functions callable from C, intended to support
  * IEEE arithmetic.
  */
-extern float copysignf __P((float, float));
-extern int ilogbf __P((float));
-extern float rintf __P((float));
-extern float scalbnf __P((float, int));
+extern float copysignf (float, float);
+extern int ilogbf (float);
+extern float rintf (float);
+extern float scalbnf (float, int);
 
 /*
  * float versions of BSD math library entry points
  */
-extern float dremf __P((float, float));
-extern float expm1f __P((float));
-extern float log1pf __P((float));
+extern float dremf (float, float);
+extern float expm1f (float);
+extern float log1pf (float);
 
 /*
  * Float versions of reentrant version of gamma & lgamma; passes
@@ -267,8 +267,8 @@
  * allocate space for signgam.
  */
 #ifdef _REENTRANT
-extern float gammaf_r __P((float, int *));
-extern float lgammaf_r __P((float, int *));
+extern float gammaf_r (float, int *);
+extern float lgammaf_r (float, int *);
 #endif	/* _REENTRANT */
 
 #endif /* !_XOPEN_SOURCE */
Index: lib/msun/src/math_private.h
===================================================================
RCS file: /home/dcvs/src/lib/msun/src/math_private.h,v
retrieving revision 1.2
diff -u -r1.2 math_private.h
--- lib/msun/src/math_private.h	17 Jun 2003 04:26:53 -0000	1.2
+++ lib/msun/src/math_private.h	12 Nov 2003 17:19:11 -0000
@@ -150,76 +150,76 @@
 } while (0)
 
 /* ieee style elementary functions */
-extern double __ieee754_sqrt __P((double));
-extern double __ieee754_acos __P((double));
-extern double __ieee754_acosh __P((double));
-extern double __ieee754_log __P((double));
-extern double __ieee754_atanh __P((double));
-extern double __ieee754_asin __P((double));
-extern double __ieee754_atan2 __P((double,double));
-extern double __ieee754_exp __P((double));
-extern double __ieee754_cosh __P((double));
-extern double __ieee754_fmod __P((double,double));
-extern double __ieee754_pow __P((double,double));
-extern double __ieee754_lgamma_r __P((double,int *));
-extern double __ieee754_gamma_r __P((double,int *));
-extern double __ieee754_lgamma __P((double));
-extern double __ieee754_gamma __P((double));
-extern double __ieee754_log10 __P((double));
-extern double __ieee754_sinh __P((double));
-extern double __ieee754_hypot __P((double,double));
-extern double __ieee754_j0 __P((double));
-extern double __ieee754_j1 __P((double));
-extern double __ieee754_y0 __P((double));
-extern double __ieee754_y1 __P((double));
-extern double __ieee754_jn __P((int,double));
-extern double __ieee754_yn __P((int,double));
-extern double __ieee754_remainder __P((double,double));
-extern int    __ieee754_rem_pio2 __P((double,double*));
-extern double __ieee754_scalb __P((double,double));
+extern double __ieee754_sqrt (double);
+extern double __ieee754_acos (double);
+extern double __ieee754_acosh (double);
+extern double __ieee754_log (double);
+extern double __ieee754_atanh (double);
+extern double __ieee754_asin (double);
+extern double __ieee754_atan2 (double,double);
+extern double __ieee754_exp (double);
+extern double __ieee754_cosh (double);
+extern double __ieee754_fmod (double,double);
+extern double __ieee754_pow (double,double);
+extern double __ieee754_lgamma_r (double,int *);
+extern double __ieee754_gamma_r (double,int *);
+extern double __ieee754_lgamma (double);
+extern double __ieee754_gamma (double);
+extern double __ieee754_log10 (double);
+extern double __ieee754_sinh (double);
+extern double __ieee754_hypot (double,double);
+extern double __ieee754_j0 (double);
+extern double __ieee754_j1 (double);
+extern double __ieee754_y0 (double);
+extern double __ieee754_y1 (double);
+extern double __ieee754_jn (int,double);
+extern double __ieee754_yn (int,double);
+extern double __ieee754_remainder (double,double);
+extern int    __ieee754_rem_pio2 (double,double*);
+extern double __ieee754_scalb (double,double);
 
 /* fdlibm kernel function */
-extern double __kernel_standard __P((double,double,int));
-extern double __kernel_sin __P((double,double,int));
-extern double __kernel_cos __P((double,double));
-extern double __kernel_tan __P((double,double,int));
-extern int    __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*));
+extern double __kernel_standard (double,double,int);
+extern double __kernel_sin (double,double,int);
+extern double __kernel_cos (double,double);
+extern double __kernel_tan (double,double,int);
+extern int    __kernel_rem_pio2 (double*,double*,int,int,int,const int*);
 
 
 /* ieee style elementary float functions */
-extern float __ieee754_sqrtf __P((float));
-extern float __ieee754_acosf __P((float));
-extern float __ieee754_acoshf __P((float));
-extern float __ieee754_logf __P((float));
-extern float __ieee754_atanhf __P((float));
-extern float __ieee754_asinf __P((float));
-extern float __ieee754_atan2f __P((float,float));
-extern float __ieee754_expf __P((float));
-extern float __ieee754_coshf __P((float));
-extern float __ieee754_fmodf __P((float,float));
-extern float __ieee754_powf __P((float,float));
-extern float __ieee754_lgammaf_r __P((float,int *));
-extern float __ieee754_gammaf_r __P((float,int *));
-extern float __ieee754_lgammaf __P((float));
-extern float __ieee754_gammaf __P((float));
-extern float __ieee754_log10f __P((float));
-extern float __ieee754_sinhf __P((float));
-extern float __ieee754_hypotf __P((float,float));
-extern float __ieee754_j0f __P((float));
-extern float __ieee754_j1f __P((float));
-extern float __ieee754_y0f __P((float));
-extern float __ieee754_y1f __P((float));
-extern float __ieee754_jnf __P((int,float));
-extern float __ieee754_ynf __P((int,float));
-extern float __ieee754_remainderf __P((float,float));
-extern int   __ieee754_rem_pio2f __P((float,float*));
-extern float __ieee754_scalbf __P((float,float));
+extern float __ieee754_sqrtf (float);
+extern float __ieee754_acosf (float);
+extern float __ieee754_acoshf (float);
+extern float __ieee754_logf (float);
+extern float __ieee754_atanhf (float);
+extern float __ieee754_asinf (float);
+extern float __ieee754_atan2f (float,float);
+extern float __ieee754_expf (float);
+extern float __ieee754_coshf (float);
+extern float __ieee754_fmodf (float,float);
+extern float __ieee754_powf (float,float);
+extern float __ieee754_lgammaf_r (float,int *);
+extern float __ieee754_gammaf_r (float,int *);
+extern float __ieee754_lgammaf (float);
+extern float __ieee754_gammaf (float);
+extern float __ieee754_log10f (float);
+extern float __ieee754_sinhf (float);
+extern float __ieee754_hypotf (float,float);
+extern float __ieee754_j0f (float);
+extern float __ieee754_j1f (float);
+extern float __ieee754_y0f (float);
+extern float __ieee754_y1f (float);
+extern float __ieee754_jnf (int,float);
+extern float __ieee754_ynf (int,float);
+extern float __ieee754_remainderf (float,float);
+extern int   __ieee754_rem_pio2f (float,float*);
+extern float __ieee754_scalbf (float,float);
 
 /* float versions of fdlibm kernel functions */
-extern float __kernel_sinf __P((float,float,int));
-extern float __kernel_cosf __P((float,float));
-extern float __kernel_tanf __P((float,float,int));
-extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*));
+extern float __kernel_sinf (float,float,int);
+extern float __kernel_cosf (float,float);
+extern float __kernel_tanf (float,float,int);
+extern int   __kernel_rem_pio2f (float*,float*,int,int,int,const int*);
 
 #ifdef	__alpha__
 #define __generic___ieee754_acos	__ieee754_acos
Index: share/mk/bsd.kern.mk
===================================================================
RCS file: /home/dcvs/src/share/mk/bsd.kern.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.kern.mk
--- share/mk/bsd.kern.mk	17 Jun 2003 04:37:02 -0000	1.2
+++ share/mk/bsd.kern.mk	12 Nov 2003 18:02:16 -0000
@@ -10,7 +10,7 @@
 #
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		-fformat-extensions -ansi
+		-fformat-extensions -ffreestanding -ansi
 #
 # The following flags are next up for working on:
 #	-W
Index: sys/dev/misc/syscons/syscons.h
===================================================================
RCS file: /home/dcvs/src/sys/dev/misc/syscons/syscons.h,v
retrieving revision 1.4
diff -u -r1.4 syscons.h
--- sys/dev/misc/syscons/syscons.h	10 Nov 2003 06:12:06 -0000	1.4
+++ sys/dev/misc/syscons/syscons.h	12 Nov 2003 18:01:56 -0000
@@ -418,11 +418,11 @@
 extern struct linker_set scrndr_set;
 
 #define RENDERER(name, mode, sw, set)				\
-	static struct sc_renderer scrndr_##name##_##mode## = {	\
+	static struct sc_renderer scrndr_##name##_##mode = {	\
 		#name, mode, &sw				\
 	};							\
-	DATA_SET(scrndr_set, scrndr_##name##_##mode##);		\
-	DATA_SET(set, scrndr_##name##_##mode##)
+	DATA_SET(scrndr_set, scrndr_##name##_##mode);		\
+	DATA_SET(set, scrndr_##name##_##mode)
 
 #define RENDERER_MODULE(name, set)				\
 	SET_DECLARE(set, sc_renderer_t);			\
@@ -456,7 +456,7 @@
 		scrndr_##name##_event,				\
 		NULL,						\
 	};							\
-	DECLARE_MODULE(scrndr_##name##, scrndr_##name##_mod, 	\
+	DECLARE_MODULE(scrndr_##name, scrndr_##name##_mod, 	\
 		       SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 
 typedef struct {
Index: sys/dev/netif/ray/if_ray.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/ray/if_ray.c,v
retrieving revision 1.4
diff -u -r1.4 if_ray.c
--- sys/dev/netif/ray/if_ray.c	7 Aug 2003 21:17:04 -0000	1.4
+++ sys/dev/netif/ray/if_ray.c	12 Nov 2003 18:01:56 -0000
@@ -903,7 +903,7 @@
 	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
 	RAY_MAP_CM(sc);
 
-#define MIB4(m)		ray_mib_4_default.##m
+#define MIB4(m)		ray_mib_4_default.m
 
 	MIB4(mib_net_type)		= com->c_desired.np_net_type;
 	MIB4(mib_ap_status)		= com->c_desired.np_ap_status;
@@ -967,7 +967,7 @@
 	RAY_DPRINTF(sc, RAY_DBG_SUBR | RAY_DBG_STARTJOIN, "");
 	RAY_MAP_CM(sc);
 
-#define MIB5(m)		ray_mib_5_default.##m
+#define MIB5(m)		ray_mib_5_default.m
 	MIB5(mib_net_type)		= com->c_desired.np_net_type;
 	MIB5(mib_ap_status)		= com->c_desired.np_ap_status;
 	bcopy(com->c_desired.np_ssid, MIB5(mib_ssid), IEEE80211_NWID_LEN);
Index: sys/dev/netif/wx/if_wx.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/wx/if_wx.c,v
retrieving revision 1.3
diff -u -r1.3 if_wx.c
--- sys/dev/netif/wx/if_wx.c	7 Aug 2003 21:17:06 -0000	1.3
+++ sys/dev/netif/wx/if_wx.c	12 Nov 2003 18:01:56 -0000
@@ -1403,8 +1403,8 @@
  * and, more importantly, garbage collect completed transmissions
  * and to handle link status changes.
  */
-#define	WX_PRT_STATS(sc, y)	printf("\t" # y " = %u\n", (sc)-> ## y )
-#define	WX_CLR_STATS(sc, y)	(sc)-> ## y  = 0
+#define	WX_PRT_STATS(sc, y)	printf("\t" # y " = %u\n", ((sc)->y))
+#define	WX_CLR_STATS(sc, y)	((sc)->y  = 0)
 
 static void
 wx_watchdog(void *arg)
Index: sys/i386/i386/identcpu.c
===================================================================
RCS file: /home/dcvs/src/sys/i386/i386/identcpu.c,v
retrieving revision 1.6
diff -u -r1.6 identcpu.c
--- sys/i386/i386/identcpu.c	29 Sep 2003 15:56:42 -0000	1.6
+++ sys/i386/i386/identcpu.c	12 Nov 2003 18:01:56 -0000
@@ -734,15 +734,14 @@
  */
 inthand_t	bluetrap6;
 __asm
-("
-	.text
-	.p2align 2,0x90
-	.type	" __XSTRING(CNAME(bluetrap6)) ",@function
-" __XSTRING(CNAME(bluetrap6)) ":
-	ss
-	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
-	addl	$2, (%esp)		  # I know rdmsr is a 2-bytes instruction.
-	iret
+("  .text																\n\
+	.p2align 2,0x90														\n\
+	.type	" __XSTRING(CNAME(bluetrap6)) ",@function					\n\
+" __XSTRING(CNAME(bluetrap6)) ":										\n\
+	ss																	\n\
+	movl	$0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "				\n\
+	addl	$2, (%esp)		  # I know rdmsr is a 2-bytes instruction.	\n\
+	iret																\n\
 ");
 
 /*
@@ -751,16 +750,15 @@
  */
 inthand_t	bluetrap13;
 __asm
-("
-	.text
-	.p2align 2,0x90
-	.type " __XSTRING(CNAME(bluetrap13)) ",@function
-" __XSTRING(CNAME(bluetrap13)) ":
-	ss
-	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
-	popl	%eax				# discard errorcode.
-	addl	$2, (%esp)			# I know rdmsr is a 2-bytes instruction.
-	iret
+("  .text																\n\
+	.p2align 2,0x90														\n\
+	.type " __XSTRING(CNAME(bluetrap13)) ",@function					\n\
+" __XSTRING(CNAME(bluetrap13)) ":										\n\
+	ss																	\n\
+	movl	$0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "				\n\
+	popl	%eax			# discard errorcode.						\n\
+	addl	$2, (%esp)		# I know rdmsr is a 2-bytes instruction.	\n\
+	iret																\n\
 ");
 
 /*
Index: sys/i386/i386/locore.s
===================================================================
RCS file: /home/dcvs/src/sys/i386/i386/locore.s,v
retrieving revision 1.8
diff -u -r1.8 locore.s
--- sys/i386/i386/locore.s	24 Oct 2003 14:10:45 -0000	1.8
+++ sys/i386/i386/locore.s	12 Nov 2003 18:01:56 -0000
@@ -96,9 +96,9 @@
 	.data
 	ALIGN_DATA		/* just to be sure */
 
-	.globl	HIDENAME(tmpstk)
+	.globl	.tmpstk
 	.space	0x2000		/* space for tmpstk - temporary stack */
-HIDENAME(tmpstk):
+.tmpstk:
 
 	.globl	boothowto,bootdev
 
@@ -274,7 +274,7 @@
  * the old stack, but it need not be, since recover_bootinfo actually
  * returns via the old frame.
  */
-	movl	$R(HIDENAME(tmpstk)),%esp
+	movl	$R(.tmpstk),%esp
 
 #ifdef PC98
 	/* pc98_machine_type & M_EPSON_PC98 */
Index: sys/kern/kern_lock.c
===================================================================
RCS file: /home/dcvs/src/sys/kern/kern_lock.c,v
retrieving revision 1.8
diff -u -r1.8 kern_lock.c
--- sys/kern/kern_lock.c	2 Oct 2003 22:27:00 -0000	1.8
+++ sys/kern/kern_lock.c	12 Nov 2003 18:01:56 -0000
@@ -186,13 +186,13 @@
 #else
 		    if (lockmgr_from_int == 2) {
 			    didpanic = 1;
-			    panic("
-				lockmgr %s from %s:%d: called from interrupt",
+			    panic(
+				"lockmgr %s from %s:%d: called from interrupt",
 				lkp->lk_wmesg, file, line);
 			    didpanic = 0;
 		    } else {
-			    printf("
-				lockmgr %s from %s:%d: called from interrupt\n",
+			    printf(
+				"lockmgr %s from %s:%d: called from interrupt\n",
 				lkp->lk_wmesg, file, line);
 		    }
 #endif
Index: sys/vfs/coda/coda_subr.c
===================================================================
RCS file: /home/dcvs/src/sys/vfs/coda/coda_subr.c,v
retrieving revision 1.4
diff -u -r1.4 coda_subr.c
--- sys/vfs/coda/coda_subr.c	7 Aug 2003 21:17:40 -0000	1.4
+++ sys/vfs/coda/coda_subr.c	12 Nov 2003 18:01:56 -0000
@@ -417,12 +417,12 @@
 	      cp->c_flags &= ~C_VATTR;
 	      if (CTOV(cp)->v_flag & VTEXT)
 		  error = coda_vmflush(cp);
-	      CODADEBUG(CODA_ZAPFILE, myprintf(("zapfile: fid = (%lx.%lx.%lx), 
-                                              refcnt = %d, error = %d\n",
-					      cp->c_fid.Volume, 
-					      cp->c_fid.Vnode, 
-					      cp->c_fid.Unique, 
-					      CTOV(cp)->v_usecount - 1, error)););
+	      CODADEBUG(CODA_ZAPFILE, 
+		  	myprintf(("zapfile: fid = (%lx.%lx.%lx), refcnt = %d, error = %d\n",
+		    	cp->c_fid.Volume, 
+			    cp->c_fid.Vnode, 
+			    cp->c_fid.Unique, 
+			    CTOV(cp)->v_usecount - 1, error)););
 	      if (CTOV(cp)->v_usecount == 1) {
 		  cp->c_flags |= C_PURGING;
 	      }
@@ -445,11 +445,12 @@
 	      cp->c_flags &= ~C_VATTR;
 	      coda_nc_zapParentfid(&out->coda_zapdir.CodaFid, IS_DOWNCALL);     
 	      
-	      CODADEBUG(CODA_ZAPDIR, myprintf(("zapdir: fid = (%lx.%lx.%lx), 
-                                          refcnt = %d\n",cp->c_fid.Volume, 
-					     cp->c_fid.Vnode, 
-					     cp->c_fid.Unique, 
-					     CTOV(cp)->v_usecount - 1)););
+	      CODADEBUG(CODA_ZAPDIR, 
+		  	myprintf(("zapdir: fid = (%lx.%lx.%lx), refcnt = %d\n",
+				cp->c_fid.Volume, 
+				cp->c_fid.Vnode, 
+				cp->c_fid.Unique, 
+				CTOV(cp)->v_usecount - 1)););
 	      if (CTOV(cp)->v_usecount == 1) {
 		  cp->c_flags |= C_PURGING;
 	      }


[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]