Cosmetic (no functional changes):

o   Add missing $Id$s
o   Move extern decls from .c -> .h files
o   Staticize
o   Remove #includes from .h files
o   style(9)ify includes
o   bcopy -> memcpy
    bzero -> memset
    bcmp -> memcmp
    index -> strchr
    rindex -> strrchr
o   Move timeout.h -> timer.h (making it consistent w/ timer.c)
o   Add -Wmissing-prototypes

1 files changed, 23 insertions, 45 deletions

diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index d9d4ea1..95c4e24 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -15,44 +15,30 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: defs.h,v 1.20 1997/10/23 21:32:48 ache Exp $
+ * $Id: defs.h,v 1.21 1997/10/24 22:36:29 brian Exp $
  *
  *	TODO:
  */
 
-#ifndef _DEFS_H_
-#define	_DEFS_H_
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <termios.h>
-#include "mbuf.h"
-#include "log.h"
-
 /*
- *  Check follwiing definitions for your machine envirinment
+ *  Check following definitions for your machine environment
  */
 #ifdef __FreeBSD__
-#define	MODEM_DEV	"/dev/cuaa1"	/* name of tty device */
-#define	BASE_MODEM_DEV	"cuaa1"	/* name of base tty device */
-#else
-#ifdef __OpenBSD__
-#define	MODEM_DEV	"/dev/cua01"	/* name of tty device */
-#define	BASE_MODEM_DEV	"cua01"	/* name of base tty device */
+# define  MODEM_DEV		"/dev/cuaa1"	/* name of tty device */
+# define  BASE_MODEM_DEV	"cuaa1"		/* name of base tty device */
 #else
-#define	MODEM_DEV	"/dev/tty01"	/* name of tty device */
-#define	BASE_MODEM_DEV	"tty01"	/* name of base tty device */
-#endif
+# ifdef __OpenBSD__
+#  define MODEM_DEV		"/dev/cua01"	/* name of tty device */
+#  define BASE_MODEM_DEV	"cua01"		/* name of base tty device */
+# else
+#  define MODEM_DEV		"/dev/tty01"	/* name of tty device */
+#  define BASE_MODEM_DEV	"tty01"		/* name of base tty device */
+# endif
 #endif
+
 #define MODEM_SPEED	B38400	/* tty speed */
 #define	SERVER_PORT	3000	/* Base server port no. */
-
-#define	MODEM_CTSRTS	TRUE	/* Default (true): use CTS/RTS signals */
+#define	MODEM_CTSRTS	1	/* Default (true): use CTS/RTS signals */
 #define	RECONNECT_TIMER	3	/* Default timer for carrier loss */
 #define	RECONNECT_TRIES	0	/* Default retries on carrier loss */
 #define	REDIAL_PERIOD	30	/* Default Hold time to redial */
@@ -74,7 +60,6 @@
 #define	MODE_ALIAS	32	/* Packet aliasing (masquerading) */
 #define MODE_BACKGROUND 64	/* Background mode. */
 
-
 #define	EX_SIG		-1
 #define	EX_NORMAL	0
 #define	EX_START	1
@@ -90,24 +75,17 @@
 #define EX_NODIAL	12
 #define EX_NOLOGIN	13
 
-int mode;
-int BGFiledes[2];
-
-int modem;
-int tun_in, tun_out;
-int netfd;
-char *dstsystem;
-
-#ifndef TRUE
-#define	TRUE 	(1)
-#endif
-#ifndef FALSE
-#define	FALSE 	(0)
-#endif
+extern int mode;
+extern int BGFiledes[2];
+extern int modem;
+extern int tun_in;
+extern int tun_out;
+extern int netfd;
+extern char *dstsystem;
 
 #ifdef SIGALRM
-u_int nointr_sleep(u_int sec);
-void nointr_usleep(u_int usec);
+extern u_int nointr_sleep(u_int);
+extern void nointr_usleep(u_int);
 #endif
 
-#endif				/* _DEFS_H_ */
+extern void randinit(void);