minor cleanup

diff --git a/pppd/ipcp.h b/pppd/ipcp.h
index 2dc68e74d3f303541b0ef2e451d77f39bc704558..620b70fb35b317af3673ee0bf6d0409a6c5925f3 100644 (file)
--- a/pppd/ipcp.h
+++ b/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.h,v 1.7 1996/01/01 22:56:54 paulus Exp $
+ * $Id: ipcp.h,v 1.8 1996/04/04 03:57:37 paulus Exp $
  */
 
 /*
@@ -53,9 +53,7 @@ typedef struct ipcp_options {
     u_short vj_protocol;       /* protocol value to use in VJ option */
     u_char maxslotindex, cflag;        /* values for RFC1332 VJ compression neg. */
     u_int32_t ouraddr, hisaddr;        /* Addresses in NETWORK BYTE ORDER */
-#ifdef USE_MS_DNS
-    u_int32_t dnsaddr[2];      /* Primary and secondary DNS entries */
-#endif
+    u_int32_t dnsaddr[2];      /* Primary and secondary MS DNS entries */
 } ipcp_options;
 
 extern fsm ipcp_fsm[];
@@ -74,5 +72,6 @@ void ipcp_protrej __P((int));
 int  ipcp_printpkt __P((u_char *, int, void (*)(), void *));
 void ip_check_options __P((void));
 int  ip_demand_conf __P((int));
+char *ip_ntoa __P((u_int32_t));
 
 extern struct protent ipcp_protent;

diff --git a/pppd/magic.c b/pppd/magic.c
index 4797f0b19fd636f09c357b786b3378c002519ebd..9e95994953812e52dbeecd253f9bc23fbc08f26f 100644 (file)
--- a/pppd/magic.c
+++ b/pppd/magic.c
@@ -18,23 +18,20 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: magic.c,v 1.5 1995/06/06 01:52:25 paulus Exp $";
+static char rcsid[] = "$Id: magic.c,v 1.6 1996/04/04 03:58:41 paulus Exp $";
 #endif
 
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include "pppd.h"
 #include "magic.h"
 
-static u_int32_t next;         /* Next value to return */
-
-extern int gethostid __P((void));
 extern long mrand48 __P((void));
 extern void srand48 __P((long));
 
-
 /*
  * magic_init - Initialize the magic number generator.
  *