summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2010-09-23 09:27:50 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2010-09-23 09:27:50 +0000
commitd69b908469935164394629f269f322e458433ad8 (patch)
tree032dd2272d2a7cfccd4bda5a14d4a8c68de4882d
parentbd661c3b13fb381c0473eade3ec183588867ce42 (diff)
Do not declare the domain and protosw structures in at.h fixes build with
netatalk enabled.
-rw-r--r--sys/netatalk/at.h7
-rw-r--r--sys/netatalk/at_proto.c4
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index b0a42d41135..8713b072e84 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: at.h,v 1.3 2003/05/14 02:02:55 itojun Exp $ */
+/* $OpenBSD: at.h,v 1.4 2010/09/23 09:27:49 claudio Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -133,9 +133,4 @@ struct sockaddr_at {
#define sat_zero sat_range.r_zero
-#ifdef _KERNEL
-extern struct domain atalkdomain;
-extern struct protosw atalksw[];
-#endif
-
#endif /* __AT_HEADER__ */
diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c
index 919c560bb87..703303e5db9 100644
--- a/sys/netatalk/at_proto.c
+++ b/sys/netatalk/at_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: at_proto.c,v 1.2 2007/12/14 18:33:40 deraadt Exp $ */
+/* $OpenBSD: at_proto.c,v 1.3 2010/09/23 09:27:49 claudio Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -85,6 +85,8 @@
#include <netatalk/ddp_var.h>
#include <netatalk/at_extern.h>
+struct domain atalkdomain;
+
struct protosw atalksw[] = {
{
/* Identifiers */