[src/trunk]: src/usr.sbin/isdn/isdnd Don't duplicate essential #defines from ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c294957a73f8
branches:  trunk
changeset: 508331:c294957a73f8
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 09 21:18:00 2001 +0000

description:
Don't duplicate essential #defines from if_sppp.h, instead include
that properly.

diffstat:

 usr.sbin/isdn/isdnd/isdnd.h     |  11 ++++++++---
 usr.sbin/isdn/isdnd/rc_config.c |  14 +-------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diffs (66 lines):

diff -r 3152a5ca1543 -r c294957a73f8 usr.sbin/isdn/isdnd/isdnd.h
--- a/usr.sbin/isdn/isdnd/isdnd.h       Mon Apr 09 21:17:33 2001 +0000
+++ b/usr.sbin/isdn/isdnd/isdnd.h       Mon Apr 09 21:18:00 2001 +0000
@@ -27,7 +27,7 @@
  *     i4b daemon - main header file
  *     -----------------------------
  *
- *     $Id: isdnd.h,v 1.1.1.1 2001/01/06 13:00:16 martin Exp $ 
+ *     $Id: isdnd.h,v 1.2 2001/04/09 21:18:00 martin Exp $ 
  *
  * $FreeBSD$
  *
@@ -69,6 +69,13 @@
 #include <sys/rtprio.h>
 #endif
 
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <net/if.h>
+#include <net/if_sppp.h>
 #include <netisdn/i4b_ioctl.h>
 #include <netisdn/i4b_cause.h>
 
@@ -360,8 +367,6 @@
 #define AUTH_RECHALLENGE 0x01
 #define AUTH_REQUIRED    0x02
 
-#define AUTHNAMELEN    32 /* AUTHNAMELEN must match in <machine/i4b_isppp.h> */
-#define AUTHKEYLEN     16
        char    ppp_expect_name[AUTHNAMELEN];   /* PPP PAP/CHAP login name */
        char    ppp_send_name[AUTHNAMELEN];
 
diff -r 3152a5ca1543 -r c294957a73f8 usr.sbin/isdn/isdnd/rc_config.c
--- a/usr.sbin/isdn/isdnd/rc_config.c   Mon Apr 09 21:17:33 2001 +0000
+++ b/usr.sbin/isdn/isdnd/rc_config.c   Mon Apr 09 21:18:00 2001 +0000
@@ -27,7 +27,7 @@
  *     i4b daemon - config file processing
  *     -----------------------------------
  *
- *     $Id: rc_config.c,v 1.2 2001/01/07 09:00:49 martin Exp $ 
+ *     $Id: rc_config.c,v 1.3 2001/04/09 21:18:00 martin Exp $ 
  *
  * $FreeBSD$
  *
@@ -43,18 +43,6 @@
 #include <sys/callout.h>
 #include <sys/ioctl.h>
 
-#include <net/if.h>
-#ifdef __NetBSD__
-#include <net/if_sppp.h>
-#else
-#if __FreeBSD__ == 3
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#endif
-#include <net/if_var.h>
-#include <machine/i4b_isppp.h>
-#endif
-
 #include "isdnd.h"
 #include "y.tab.h"