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

@@ -47,12 +47,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
+#ifdef LOCALNAT
-#include <alias.h>
-#else
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "defs.h"
 #include "command.h"

usr.sbin/ppp/ipcp.c

@@ -42,12 +42,13 @@
 #include <unistd.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
+#ifdef LOCALNAT
-#include <alias.h>
-#else
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "ua.h"
 #include "defs.h"

usr.sbin/ppp/main.c

@@ -43,12 +43,13 @@
 #include <sys/stat.h>
 
 #ifndef NONAT
-#ifdef __FreeBSD__
+#ifdef LOCALNAT
-#include <alias.h>
-#else
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
 #endif
+
 #include "layer.h"
 #include "probe.h"
 #include "mbuf.h"

usr.sbin/ppp/nat_cmd.c

@@ -19,11 +19,12 @@
 #include <string.h>
 #include <termios.h>
 
-#ifdef __FreeBSD__
+#ifdef LOCALNAT
-#include <alias.h>
-#else
 #include "alias.h"
+#else
+#include <alias.h>
 #endif
+
 #include "layer.h"
 #include "proto.h"
 #include "defs.h"

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>