From 10e629b937215bee251fd4dea743ba721aaa3350 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Tue, 14 Mar 2000 01:47:02 +0000
Subject: [PATCH] Introduce LOCALNAT and LOCALRAD defines so that the sources
 can stay exactly the same in FreeBSD & OpenBSD despite libalias and libradius
 being local to the ppp sources under OpenBSD.

---
 usr.sbin/ppp/command.c | 7 ++++---
 usr.sbin/ppp/ipcp.c    | 7 ++++---
 usr.sbin/ppp/main.c    | 7 ++++---
 usr.sbin/ppp/nat_cmd.c | 7 ++++---
 usr.sbin/ppp/radius.c  | 7 ++++++-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index e815893e211b..5e39b7256efd 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -47,12 +47,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "defs.h"
 #include "command.h"
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index f95834dd1c88..6e3260b60dfe 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -42,12 +42,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "ua.h"
 #include "defs.h"
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 126505f0da4b..336ed3e2da77 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -43,12 +43,13 @@
 #include <sys/stat.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "probe.h"
 #include "mbuf.h"
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index a2fb917b5614..ed7876d5bac7 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -19,11 +19,12 @@
 #include <string.h>
 #include <termios.h>
 
-#ifdef __FreeBSD__
-#include <alias.h>
-#else
+#ifdef LOCALNAT
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
+
 #include "layer.h"
 #include "proto.h"
 #include "defs.h"
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index d3f51c870b80..cac6b6ebe22c 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -36,8 +36,13 @@
 #include <sys/un.h>
 #include <net/route.h>
 
-#include <errno.h>
+#ifdef LOCALRAD
+#include "radlib.h"
+#else
 #include <radlib.h>
+#endif
+
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>