Assume __STDC__, remove non-__STDC__ code. Remove private __P.

libexec/bootpd/tools/bootpef/bootpef.c

@@ -37,11 +37,7 @@ SOFTWARE.
 
 
 
-#ifdef	__STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -89,17 +85,8 @@ SOFTWARE.
  * Externals, forward declarations, and global variables
  */
 
-#ifdef	__STDC__
-#define P(args) args
-#else
-#define P(args) ()
-#endif
-
-static void mktagfile P((struct host *));
-static void usage P((void));
-
-#undef P
-
+static void mktagfile(struct host *);
+static void usage(void);
 
 /*
  * General

libexec/bootpd/tools/bootptest/bootptest.h

@@ -1,4 +1,5 @@
 /* bootptest.h */
+/* $FreeBSD$ */
 /*
  * Hacks for sharing print-bootp.c between tcpdump and bootptest.
  */
@@ -19,12 +20,4 @@ extern int vflag; /* verbose flag */
 extern unsigned char *packetp;
 extern unsigned char *snapend;
 
-#ifdef	__STDC__
-#define P(args) args
-#else
-#define P(args) ()
-#endif
-
-extern char *ipaddr_string P((struct in_addr *));
-
-#undef P
+extern char *ipaddr_string(struct in_addr *);