Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

3 files changed, 7 insertions, 23 deletions

diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c
index 82e93d67310..01c61b9a5be 100644
--- a/usr.bin/sup/src/expand.c
+++ b/usr.bin/sup/src/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.12 2002/02/16 21:27:54 millert Exp $	*/
+/*	$OpenBSD: expand.c,v 1.13 2002/02/17 19:42:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -89,14 +89,6 @@ static	int	bufcnt;			/* current number in buffer */
 
 #define fixit(a) (a[0] ? a : ".")
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(a)	a
-#else
-#define __P(a)	()
-#endif
-#endif
-
 int expand(char *, char **, int);
 static void glob(char *);
 static void matchdir(char *);
diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c
index bb9958eb4c9..4f9224dd637 100644
--- a/usr.bin/sup/src/stree.c
+++ b/usr.bin/sup/src/stree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stree.c,v 1.9 2002/02/16 21:27:54 millert Exp $	*/
+/*	$OpenBSD: stree.c,v 1.10 2002/02/17 19:42:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -67,7 +67,7 @@ Static TREE *Trothl(TREE *, TREE *);
 Static TREE *Trothh(TREE *, TREE *);
 Static void Tbalance(TREE **);
 Static TREE *Tinsertavl(TREE **, char *, int, int *);
-Static int Tsubprocess __P((TREE *, int, int (*f )(TREE *, void *), void *));
+Static int Tsubprocess(TREE *, int, int (*f )(TREE *, void *), void *);
 Static int Tprintone(TREE *, void *);
 
 
diff --git a/usr.bin/sup/src/supextern.h b/usr.bin/sup/src/supextern.h
index b2e234e8fa4..d371c9417a5 100644
--- a/usr.bin/sup/src/supextern.h
+++ b/usr.bin/sup/src/supextern.h
@@ -1,12 +1,4 @@
-/*     $OpenBSD: supextern.h,v 1.6 2002/02/16 21:27:54 millert Exp $  */
-
-#ifndef __P
-#ifdef __STDC__
-#define __P(a)	a
-#else
-#define	__P(a) ()
-#endif
-#endif
+/*     $OpenBSD: supextern.h,v 1.7 2002/02/17 19:42:33 millert Exp $  */
 
 /* atoo.c */
 unsigned int atoo(char *);
@@ -118,8 +110,8 @@ void Tfree(TREE **);
 TREE *Tinsert(TREE **, char *, int);
 TREE *Tsearch(TREE *, char *);
 TREE *Tlookup(TREE *, char *);
-int Trprocess __P((TREE *, int (*)(TREE *, void *), void *));
-int Tprocess __P((TREE *, int (*)(TREE *, void *), void *));
+int Trprocess(TREE *, int (*)(TREE *, void *), void *);
+int Tprocess(TREE *, int (*)(TREE *, void *), void *);
 void Tprint(TREE *, char *);
 
 /* supcmeat.c */
@@ -172,7 +164,7 @@ int msglist(void);
 int msgneed(void);
 int msgdeny(void);
 int msgsend(void);
-int msgrecv __P((int (*)(TREE *, va_list), ...));
+int msgrecv(int (*)(TREE *, va_list), ...);
 int msgdone(void);
 int msggoaway(void);
 int msgxpatch(void);