Cleaunup and refactor ad_open

[netatalk.git] / sys / netatalk / at.h

diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 3a38a7e70fd76af3eab5f8d3e5f589f4476bfacc..ddb2ab50bbd37181d57e3d11be57f4e48cc87967 100644 (file)
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,5 +1,5 @@
 /*
- * $Id: at.h,v 1.3 2001-11-25 21:55:10 srittau Exp $
+ * $Id: at.h,v 1.6 2008-12-18 17:31:31 morgana Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  *
@@ -13,12 +13,18 @@
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
+
+#ifdef HAVE_ATALK_ADDR
+#define at_addr atalk_addr
+#define netrange atalk_netrange
+#endif /* HAVE_ATALK_ADDR */
+
 #else /* linux */
 
 #include <sys/types.h>
 #include <netinet/in.h> /* so that we can deal with sun's s_net #define */
 
-#ifdef MACOSX_SERVER
+#if defined(MACOSX_SERVER) && (!defined(NO_DDP))
 #include <netat/appletalk.h>
 #endif /* MACOSX_SERVER */
 
@@ -36,8 +42,12 @@
  * These should really be in some global header file, but we can't
  * count on them being there, and it's annoying to patch system files.
  */
+#ifndef ETHERTYPE_AT
 #define ETHERTYPE_AT   0x809B          /* AppleTalk protocol */
+#endif
+#ifndef ETHERTYPE_AARP
 #define ETHERTYPE_AARP 0x80F3          /* AppleTalk ARP */
+#endif
 
 #define DDP_MAXSZ      587
 
@@ -121,3 +131,4 @@ extern struct protosw       atalksw[];
 
 #endif /* linux */
 #endif /* __AT_HEADER__ */
+