[src/trunk]: src/sys/arch/amiga/amiga provide CCITT includes, and work around...

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

details:   https://anonhg.NetBSD.org/src/rev/5e025e3f2e52
branches:  trunk
changeset: 484115:5e025e3f2e52
user:      is <is%NetBSD.org@localhost>
date:      Sun Mar 26 07:52:58 2000 +0000

description:
provide CCITT includes, and work around namespace collision

diffstat:

 sys/arch/amiga/amiga/machdep.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 05b86d889cc6 -r 5e025e3f2e52 sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c    Sun Mar 26 06:51:46 2000 +0000
+++ b/sys/arch/amiga/amiga/machdep.c    Sun Mar 26 07:52:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.148 2000/03/23 06:33:08 thorpej Exp $    */
+/*     $NetBSD: machdep.c,v 1.149 2000/03/26 07:52:58 is Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,6 +45,7 @@
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_atalk.h"
+#include "opt_ccitt.h"
 #include "opt_iso.h"
 #include "opt_ns.h"
 #include "opt_compat_netbsd.h"
@@ -129,6 +130,13 @@
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
+#ifdef CCITT 
+#undef PS      /* XXX namespace collision */
+#include <netccitt/x25.h>
+#include <netccitt/pk.h>
+#include <netccitt/pk_extern.h>
+#undef PS      /* XXX namespace collision */
+#endif 
 #ifdef NS
 #include <netns/ns_var.h>
 #endif