Remove NO__P since __P has been removed. Found by hin@ -moj

17 files changed, 40 insertions, 181 deletions

diff --git a/usr.sbin/mopd/common/cmp.h b/usr.sbin/mopd/common/cmp.h
index dda18aa514c..f1a2e57756a 100644
--- a/usr.sbin/mopd/common/cmp.h
+++ b/usr.sbin/mopd/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: cmp.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,19 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: cmp.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _CMP_H_
 #define _CMP_H_
 
-#ifdef NO__P
-int	mopCmpEAddr (/* u_char *,u_char * */);
-#else
-__BEGIN_DECLS
 int	mopCmpEAddr(u_char *,u_char *);
-__END_DECLS
-#endif
 
 #endif /* _CMP_H_ */
diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c
index 88bac90f00e..ac5a6364054 100644
--- a/usr.sbin/mopd/common/device.c
+++ b/usr.sbin/mopd/common/device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.c,v 1.4 2000/02/20 17:45:33 bitblt Exp $ */
+/*	$OpenBSD: device.c,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: device.c,v 1.4 2000/02/20 17:45:33 bitblt Exp $";
+static char rcsid[] = "$OpenBSD: device.c,v 1.5 2002/06/10 21:05:25 maja Exp $";
 #endif
 
 #include "os.h"
@@ -41,16 +41,11 @@ struct	if_info *iflist;		/* Interface List		*/
 
 void mopReadDL();
 void mopReadRC();
-#ifdef NO__P
-int  mopOpenDL(/* struct if_info *, int */);
-int  mopOpenRC(/* struct if_info *, int */);
-#else
 int  mopOpenDL(struct if_info *, int);
 int  mopOpenRC(struct if_info *, int);
-#endif
-int pfTrans();
-int pfInit();
-int pfWrite();
+int  pfTrans();
+int  pfInit();
+int  pfWrite();
 
 #ifdef	DEV_NEW_CONF
 /*
diff --git a/usr.sbin/mopd/common/device.h b/usr.sbin/mopd/common/device.h
index 72b81d094d4..f830f1f0972 100644
--- a/usr.sbin/mopd/common/device.h
+++ b/usr.sbin/mopd/common/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.4 2002/04/01 17:09:09 danh Exp $ */
+/*	$OpenBSD: device.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,27 +28,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: device.h,v 1.4 2002/04/01 17:09:09 danh Exp $
+ *	$OpenBSD: device.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _DEVICE_H_
 #define _DEVICE_H_
 
-#ifdef NO__P
-#ifdef	DEV_NEW_CONF
-void	deviceEthAddr (/* char *,u_char * */);
-#endif
-void	deviceInitOne (/* char * */);
-void	deviceInitAll (/* void */);
-#else
-__BEGIN_DECLS
 #ifdef	DEV_NEW_CONF
 void	deviceEthAddr(char *,u_char *);
 #endif
 void	deviceInitOne(char *);
 void	deviceInitAll(void);
-__END_DECLS
-#endif
 
 #endif /* _DEVICE_H_ */
diff --git a/usr.sbin/mopd/common/dl.h b/usr.sbin/mopd/common/dl.h
index 99a3bd79e0b..f360b098f8c 100644
--- a/usr.sbin/mopd/common/dl.h
+++ b/usr.sbin/mopd/common/dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: dl.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,19 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: dl.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _DL_H_
 #define _DL_H_
 
-#ifdef NO__P
-void	mopDumpDL       (/* FILE *, u_char *, int */);
-#else
-__BEGIN_DECLS
 void	mopDumpDL(FILE *, u_char *, int);
-__END_DECLS
-#endif
 
 #endif /* _DL_H_ */
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 9c6df070eb9..6314e95e8da 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
+/*	$OpenBSD: file.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,28 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $
+ *	$OpenBSD: file.h,v 1.6 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _FILE_H_
 #define _FILE_H_
 
-#ifdef NO__P
-void	mopFilePutLX   (/* u_char *, int, u_long, int */);
-void	mopFilePutBX   (/* u_char *, int, u_long, int */);
-u_long	mopFileGetLX   (/* u_char *, int, int */);
-u_long	mopFileGetBX   (/* u_char *, int, int */);
-void	mopFileSwapX   (/* u_char *, int, int */);
-int	CheckMopFile   (/* int */);
-int	GetMopFileInfo (/* int, u_long *, u_long * */);
-int	CheckAOutFile  (/* int */);
-int	GetAOutFileInfo(/* int, u_long *, u_long *, u_long *, u_long *,
-			   u_long *, u_long *, u_long *, u_long * */);
-int	GetFileInfo    (/* int, u_long *, u_long *, int *, u_long *, u_long *,
-			   u_long *, u_long *, u_long *, u_long * */);
-#else
-__BEGIN_DECLS
 void	mopFilePutLX(u_char *, int, u_long, int);
 void	mopFilePutBX(u_char *, int, u_long, int);
 u_long	mopFileGetLX(u_char *, int, int);
@@ -62,7 +47,5 @@ int	GetAOutFileInfo(int, u_long *, u_long *, u_long *, u_long *,
 			u_long *, u_long *, u_long *, u_long *, int *);
 int	GetFileInfo(int, u_long *, u_long *, int *, u_long *, u_long *,
 		    u_long *, u_long *, u_long *, u_long *);
-__END_DECLS
-#endif
 
 #endif /* _FILE_H_ */
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index c70bb6cfee8..80db5f814d6 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
+/*	$OpenBSD: get.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,24 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $
+ *	$OpenBSD: get.h,v 1.6 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _GET_H_
 #define _GET_H_
 
-#ifdef NO__P
-u_char	mopGetChar   (/* u_char *, int * */);
-u_short	mopGetShort  (/* u_char *, int * */);
-u_long	mopGetLong   (/* u_char *, int * */);
-void	mopGetMulti  (/* u_char *, int *,u_char *,int */);
-int	mopGetTrans  (/* u_char *, int */);
-void	mopGetHeader (/* u_char *, int *, u_char **, u_char **, u_short *,
-			 int *, int */);
-u_short	mopGetLength (/* u_char *, int */);
-#else
-__BEGIN_DECLS
 u_char	mopGetChar(u_char *,int *);
 u_short	mopGetShort(u_char *,int *);
 u_long	mopGetLong(u_char *,int *);
@@ -54,7 +43,5 @@ int	mopGetTrans(u_char *, int);
 void	mopGetHeader(u_char *, int *, u_char **, u_char **, u_short *,
 		     int *, int);
 u_short	mopGetLength(u_char *, int);
-__END_DECLS
-#endif
 
 #endif /* _GET_H_ */
diff --git a/usr.sbin/mopd/common/nma.h b/usr.sbin/mopd/common/nma.h
index 1ead51b5007..45f75e36b34 100644
--- a/usr.sbin/mopd/common/nma.h
+++ b/usr.sbin/mopd/common/nma.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: nma.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
@@ -28,21 +28,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: nma.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _NMA_H_
 #define _NMA_H_
 
-#ifdef NO__P
-char	*nmaGetShort  (/* int */);
-char	*nmaGetDevice (/* int */);
-#else
-__BEGIN_DECLS
 char	*nmaGetShort(int);
 char	*nmaGetDevice(int);
-__END_DECLS
-#endif
 
 #endif /* _NMA_H_ */
diff --git a/usr.sbin/mopd/common/pf.h b/usr.sbin/mopd/common/pf.h
index fcec3fbecec..95ee7fa2647 100644
--- a/usr.sbin/mopd/common/pf.h
+++ b/usr.sbin/mopd/common/pf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: pf.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,23 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: pf.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _PF_H_
 #define _PF_H_
 
-#ifdef NO__P
-int	pfTrans	   (/* char * */);
-int	pfInit     (/* char *, int, u_short, int */);
-int	pfEthAddr  (/* int, u_char * */);
-int	pfAddMulti (/* int, char *, char * */);
-int	pfDelMulti (/* int, char *, char * */);
-int	pfRead     (/* int, u_char *, int */);
-int	pfWrite    (/* int, u_char *, int, int  */);
-#else
-__BEGIN_DECLS
 int	pfTrans(char *);
 int	pfInit(char *, int, u_short, int);
 int	pfEthAddr(int, u_char *);
@@ -52,7 +42,5 @@ int	pfAddMulti(int, char *, char *);
 int	pfDelMulti(int, char *, char *);
 int	pfRead(int, u_char *, int);
 int	pfWrite(int, u_char *, int, int);
-__END_DECLS
-#endif
 
 #endif /* _PF_H_ */
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index 6d4ab04a1a9..0e73f9c9cb6 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
+/*	$OpenBSD: print.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,26 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $
+ *	$OpenBSD: print.h,v 1.6 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _PRINT_H_
 #define _PRINT_H_
 
-#ifdef NO__P
-void	mopPrintHWA	  (/* FILE *, u_char * */);
-void	mopPrintBPTY	  (/* FILE *, u_char */);
-void	mopPrintPGTY      (/* FILE *, u_char */);
-void	mopPrintOneline   (/* FILE *, u_char *, int */);
-void	mopPrintHeader    (/* FILE *, u_char *, int */);
-void	mopPrintMopHeader (/* FILE *, u_char *, int */);
-void	mopPrintDevice    (/* FILE *, u_char */);
-void	mopPrintTime      (/* FILE *, u_char * */);
-void	mopPrintInfo      (/* FILE *, u_char *, int *, u_short,
-			      u_char, int */);
-#else
-__BEGIN_DECLS
 void	mopPrintHWA(FILE *, u_char *);
 void	mopPrintBPTY(FILE *, u_char);
 void	mopPrintPGTY(FILE *, u_char);
@@ -57,7 +44,5 @@ void	mopPrintMopHeader(FILE *, u_char *, int);
 void	mopPrintDevice(FILE *, u_char);
 void	mopPrintTime(FILE *, u_char *);
 void	mopPrintInfo(FILE *, u_char *, int *, u_short, u_char, int);
-__END_DECLS
-#endif
 
 #endif /* _PRINT_H_ */
diff --git a/usr.sbin/mopd/common/put.h b/usr.sbin/mopd/common/put.h
index 34d9b34e9ab..2e714ec8e90 100644
--- a/usr.sbin/mopd/common/put.h
+++ b/usr.sbin/mopd/common/put.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: put.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,23 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: put.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _PUT_H_
 #define _PUT_H_
 
-#ifdef NO__P
-void	mopPutChar   (/* u_char *, int *, u_char */);
-void	mopPutShort  (/* u_char *, int *, u_short */);
-void	mopPutLong   (/* u_char *, int *, u_long */);
-void	mopPutMulti  (/* u_char *, int *, u_char *, int */);
-void	mopPutTime   (/* u_char *, int *, time_t */);
-void	mopPutHeader (/* u_char *, int *, u_char *, u_char *, u_short, int */);
-void	mopPutLength (/* u_char *, int, u_short */);
-#else
-__BEGIN_DECLS
 void	mopPutChar(u_char *, int *, u_char);
 void	mopPutShort(u_char *, int *, u_short);
 void	mopPutLong(u_char *, int *, u_long);
@@ -52,7 +42,5 @@ void	mopPutMulti(u_char *, int *, u_char *, int);
 void	mopPutTime(u_char *, int *, time_t);
 void	mopPutHeader(u_char *, int *, u_char *, u_char *, u_short, int);
 void	mopPutLength(u_char *, int, u_short);
-__END_DECLS
-#endif
 
 #endif /* _PUT_H_ */
diff --git a/usr.sbin/mopd/common/rc.h b/usr.sbin/mopd/common/rc.h
index e168d7dc44a..e411b64044d 100644
--- a/usr.sbin/mopd/common/rc.h
+++ b/usr.sbin/mopd/common/rc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: rc.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,19 +28,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: rc.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _RC_H_
 #define _RC_H_
 
-#ifdef NO__P
-void	mopDumpRC        (/* FILE *, u_char *, int */);
-#else
-__BEGIN_DECLS
 void	mopDumpRC(FILE *, u_char *, int);
-__END_DECLS
-#endif
 
 #endif /* _RC_H_ */
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index f26f19afd59..83102a143ed 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.7 2002/06/10 21:05:25 maja Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: mopchk.c,v 1.7 2002/06/10 21:05:25 maja Exp $";
 #endif
 
 /*
@@ -52,13 +52,8 @@ static char rcsid[] = "$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp
  */
 struct if_info *iflist;
 
-#ifdef NO__P
-void   Usage         (/* void */);
-void   mopProcess    (/* struct if_info *, u_char * */);
-#else
 void   Usage(void);
 void   mopProcess(struct if_info *, u_char *);
-#endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
 int	VersionFlag = 0;	/* Show version */
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 6b4ff52126d..d83116051fc 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopd.c,v 1.6 2002/05/26 09:25:21 deraadt Exp $ */
+/*	$OpenBSD: mopd.c,v 1.7 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopd.c,v 1.6 2002/05/26 09:25:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mopd.c,v 1.7 2002/06/10 21:05:25 maja Exp $";
 #endif
 
 /*
@@ -58,15 +58,9 @@ static char rcsid[] = "$OpenBSD: mopd.c,v 1.6 2002/05/26 09:25:21 deraadt Exp $"
  */
 struct if_info *iflist;
 
-#ifdef NO__P
-void   Loop	     (/* void */);
-void   Usage         (/* void */);
-void   mopProcess    (/* struct if_info *, u_char * */);
-#else
 void   Loop(void);
 void   Usage(void);
 void   mopProcess(struct if_info *, u_char *);
-#endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces */
 int     DebugFlag = 0;		/* print debugging messages   */
diff --git a/usr.sbin/mopd/mopd/process.h b/usr.sbin/mopd/mopd/process.h
index e825cc35789..f53bafb0e02 100644
--- a/usr.sbin/mopd/mopd/process.h
+++ b/usr.sbin/mopd/mopd/process.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $ */
+/*	$OpenBSD: process.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,25 +28,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $
+ *	$OpenBSD: process.h,v 1.5 2002/06/10 21:05:25 maja Exp $
  *
  */
 
 #ifndef _PROCESS_H_
 #define _PROCESS_H_
 
-#ifdef NO__P
-void	mopProcessDL (/* FILE *, struct if_info *, u_char *, int *,
-			 u_char *, u_char *, int, u_short */);
-void	mopProcessRC (/* FILE *, struct if_info *, u_char *, int *,
-			 u_char *, u_char *, int, u_short */);
-#else
-__BEGIN_DECLS
 void	mopProcessDL(FILE *, struct if_info *, u_char *, int *,
 		     u_char *, u_char *, int, u_short);
 void	mopProcessRC(FILE *, struct if_info *, u_char *, int *,
 		     u_char *, u_char *, int, u_short);
-__END_DECLS
-#endif
 
 #endif /* _PROCESS_H_ */
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index 1f0c020dd85..856fb333435 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: mopprobe.c,v 1.7 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.7 2002/06/10 21:05:25 maja Exp $";
 #endif
 
 /*
@@ -56,15 +56,9 @@ static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Ex
  */
 struct if_info *iflist;
 
-#ifdef NO__P
-void   Loop	     (/* void */);
-void   Usage         (/* void */);
-void   mopProcess    (/* struct if_info *, u_char * */);
-#else
 void   Loop(void);
 void   Usage(void);
 void   mopProcess(struct if_info *, u_char *);
-#endif
 
 struct once {
 	u_char	eaddr[6];		/* Ethernet addr */
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index bd394e154ba..73c1b345154 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.6 2002/06/10 21:05:25 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: moptrace.c,v 1.6 2002/06/10 21:05:25 maja Exp $";
 #endif
 
 /*
@@ -56,15 +56,9 @@ static char rcsid[] = "$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Ex
  */
 struct if_info *iflist;
 
-#ifdef NO__P
-void   Loop	     (/* void */);
-void   Usage         (/* void */);
-void   mopProcess    (/* struct if_info *, u_char * */);
-#else
 void   Loop(void);
 void   Usage(void);
 void   mopProcess(struct if_info *, u_char *);
-#endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
 int     DebugFlag = 0;		/* print debugging messages    */
diff --git a/usr.sbin/mopd/otherOS/Makefile b/usr.sbin/mopd/otherOS/Makefile
index b47bcce59ce..6028f3927db 100644
--- a/usr.sbin/mopd/otherOS/Makefile
+++ b/usr.sbin/mopd/otherOS/Makefile
@@ -1,7 +1,7 @@
 #  Copyright (c) 1993-1994 Mats O Jansson, Stockholm, Sweden
 #  All rights reserved.
 #
-# @(#) $OpenBSD: Makefile,v 1.3 1999/03/27 14:31:22 maja Exp $
+# @(#) $OpenBSD: Makefile,v 1.4 2002/06/10 21:05:25 maja Exp $
 
 # Script (or program) that returns the machine and os types,
 # or jsut edit in the name yourself.
@@ -11,7 +11,7 @@ REL=`cat ../common/VERSION`
 
 CCOPT = -O
 INCLUDES = -I..
-#rs6000-aix3#DEFINES = -D_AIX -D_BSD -DNO__P
+#rs6000-aix3#DEFINES = -D_AIX -D_BSD
 
 #mopchk#SPEC_FLAGS=	-DINFO -DNODL -DNOAOUT
 #mopd#SPEC_FLAGS=	-DNOAOUT
@@ -22,9 +22,9 @@ INCLUDES = -I..
 STANDARD_CFLAGS = $(CCOPT) $(SPEC_FLAGS) $(DEFINES) $(INCLUDES)
 
 # CFLAGS definitions per machine vs. os
-#sun3-sunos4#CFLAGS = $(STANDARD_CFLAGS) -DNO__P
-#sun4-sunos4#CFLAGS = $(STANDARD_CFLAGS) -DNO__P
-#sun4-sunos5#CFLAGS = $(STANDARD_CFLAGS) -DNO__P -DDLPIPF
+#sun3-sunos4#CFLAGS = $(STANDARD_CFLAGS)
+#sun4-sunos4#CFLAGS = $(STANDARD_CFLAGS)
+#sun4-sunos5#CFLAGS = $(STANDARD_CFLAGS) -DDLPIPF
 #rs6000-aix3#CFLAGS = $(STANDARD_CFLAGS)
 #alpha-linux2#CFLAGS = $(STANDARD_CFLAGS)
 #i386-linux2#CFLAGS = $(STANDARD_CFLAGS)