MacOS X fixes.

diff --git a/libatalk/netddp/netddp_open.c b/libatalk/netddp/netddp_open.c
index 2cf9007fabb42b06acafda956c9a81bd9e3d8898..2d59328f30b85507094c25b57cc5244a5f3dafe5 100644 (file)
--- a/libatalk/netddp/netddp_open.c
+++ b/libatalk/netddp/netddp_open.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_open.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_open.c,v 1.3.2.1 2001-11-25 21:36:58 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -21,8 +21,8 @@ static int _netddp_open_dummy;
 #include <sys/socket.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/libatalk/netddp/netddp_recvfrom.c b/libatalk/netddp/netddp_recvfrom.c
index 4cc7b914e4a4873ae6b42d8fafd10f68c029171e..26f00b95f27093df0db2f7df6fdfb8f6c1abcdda 100644 (file)
--- a/libatalk/netddp/netddp_recvfrom.c
+++ b/libatalk/netddp/netddp_recvfrom.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_recvfrom.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_recvfrom.c,v 1.3.2.1 2001-11-25 21:36:58 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -24,8 +24,8 @@ static int _netddp_recvfrom_dummy;
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/libatalk/netddp/netddp_sendto.c b/libatalk/netddp/netddp_sendto.c
index a81cfc883991e2b5541ce17887e8de6b401ea188..070d4ea54c7be0e81ce29004b19524ac161b6a7b 100644 (file)
--- a/libatalk/netddp/netddp_sendto.c
+++ b/libatalk/netddp/netddp_sendto.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_sendto.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_sendto.c,v 1.3.2.1 2001-11-25 21:36:58 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -25,8 +25,8 @@ static int _netddp_sendto_dummy;
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 541dcb18d492c2d0f0c6d5192f9be4abf80e09ad..c1c8200c55882864ef4f19dae643154a0a987cc6 100644 (file)
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,5 +1,5 @@
 /*
- * $Id: at.h,v 1.2 2001-06-29 14:14:47 rufustfirefly Exp $
+ * $Id: at.h,v 1.2.2.1 2001-11-25 21:38:55 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  *
@@ -9,7 +9,7 @@
 #ifndef __AT_HEADER__
 #define __AT_HEADER__
 
-#ifdef linux /* pull in the linux header */
+#if defined(linux) /* pull in the linux header */
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
@@ -18,6 +18,10 @@
 #include <sys/types.h>
 #include <netinet/in.h> /* so that we can deal with sun's s_net #define */
 
+#ifdef MACOSX_SERVER
+#include <netat/appletalk.h>
+#endif /* MACOSX_SERVER */
+
 /*
  * Supported protocols
  */
@@ -51,6 +55,7 @@
 /*
  * AppleTalk address.
  */
+#ifndef MACOSX_SERVER
 struct at_addr {
 #ifdef s_net
 #undef s_net
@@ -58,6 +63,7 @@ struct at_addr {
     u_short    s_net;
     u_char     s_node;
 };
+#endif /* MACOSX_SERVER */
 
 #define ATADDR_ANYNET  (u_short)0x0000
 #define ATADDR_ANYNODE (u_char)0x00
@@ -71,6 +77,7 @@ struct at_addr {
  * interface.  IFACE may be filled in by the client, and is filled in
  * by the kernel.
  */
+#ifndef MACOSX_SERVER
 struct sockaddr_at {
 #ifdef BSD4_4
     u_char             sat_len;
@@ -99,6 +106,7 @@ struct sockaddr_at {
     char               sat_zero[ 8 ];
 #endif /* notdef */
 };
+#endif /* MACOSX_SERVER */
 
 struct netrange {
     u_char             nr_phase;