osreldate.h stuff suggested by: Eivind Eklund

Remove #include's from sig.h and get dependant modules to include them
themselves.  Make inclusion of if_var.h depend on __FreeBSD_version so
that the -current version of ppp can be used with 2.1.*

2.2 Candidate ?

7 files changed, 20 insertions, 9 deletions

diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index da20f0f..20af40c 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
+ * $Id: arp.c,v 1.9 1997/02/22 16:09:56 peter Exp $
  *
  */
 
@@ -35,7 +35,10 @@
 #include <string.h>
 
 #include <net/if.h>
+#include <osreldate.h>
+#if __FreeBSD_version >= 199702
 #include <net/if_var.h>
+#endif
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 25b2576..a66aa18 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -18,7 +18,7 @@
  *		Columbus, OH  43221
  *		(614)451-1883
  *
- * $Id$
+ * $Id: chat.c,v 1.16 1997/02/22 16:10:06 peter Exp $
  *
  *  TODO:
  *	o Support more UUCP compatible control sequences.
@@ -34,6 +34,8 @@
 #include <sys/time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/cdefs.h>
+#include <signal.h>
 #include "sig.h"
 #include <sys/wait.h>
 #include "timeout.h"
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 204161f..d9df828 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
+ * $Id: main.c,v 1.32 1997/02/22 16:10:32 peter Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
@@ -28,6 +28,8 @@
 #include <paths.h>
 #include <sys/time.h>
 #include <termios.h>
+#include <sys/cdefs.h>
+#include <signal.h>
 #include "sig.h"
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c
index 32f24b0..08dff5b 100644
--- a/usr.sbin/ppp/os.c
+++ b/usr.sbin/ppp/os.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
+ * $Id: os.c,v 1.13 1997/02/22 16:10:38 peter Exp $
  *
  */
 #include "fsm.h"
@@ -33,7 +33,10 @@
 #include <errno.h>
 
 #include <net/if.h>
+#include <osreldate.h>
+#if __FreeBSD_version >= 199702
 #include <net/if_var.h>
+#endif
 #include <net/if_tun.h>
 #include <net/route.h>
 #include <arpa/inet.h>
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index b55b0d8..9763dab 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -26,14 +26,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sig.c,v 1.2 1997/02/22 16:10:51 peter Exp $
+ * $Id: sig.c,v 1.3 1997/02/23 20:01:19 brian Exp $
  *
  *  TODO:
  *
  */
 
+#include <sys/cdefs.h>
 #include "sig.h"
 #include <sys/types.h>
+#include <signal.h>
 #include "mbuf.h"
 #include "log.h"
 
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 3ffe765..cbc41d5 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -26,14 +26,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sig.h,v 1.3 1997/02/23 19:28:56 brian Exp $
+ * $Id: sig.h,v 1.4 1997/02/23 20:01:20 brian Exp $
  *
  *  TODO:
  *
  */
 
-#include <signal.h>
-
 typedef void (*sig_type)(int);
 
 /* Call this instead of signal() */
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index de9a08c..68214cf 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
+ * $Id: timer.c,v 1.9 1997/02/22 16:10:59 peter Exp $
  *
  *  TODO:
  */
@@ -25,6 +25,7 @@
 #include <sys/time.h>
 #include <signal.h>
 #include "timeout.h"
+#include <sys/cdefs.h>
 #include "sig.h"
 #ifdef SIGALRM
 #include <errno.h>