Forward-Ports from the stabilizing branch.

[netatalk.git] / libatalk / netddp / netddp_open.c

diff --git a/libatalk/netddp/netddp_open.c b/libatalk/netddp/netddp_open.c
index becaf6d09d0400d2c4a722437008bd6736e3be5d..aedf75570f5eb7629c8d3183c4657f4564fb844e 100644 (file)
--- a/libatalk/netddp/netddp_open.c
+++ b/libatalk/netddp/netddp_open.c
@@ -1,4 +1,6 @@
 /* 
+ * $Id: netddp_open.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
+ *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -9,7 +11,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 static int _netddp_open_dummy;
 
@@ -19,9 +21,9 @@ static int _netddp_open_dummy;
 #include <sys/socket.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
-#endif
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
+#endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>
 #include <atalk/netddp.h>
@@ -53,7 +55,7 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
       bridge->sat_addr.s_node = baddress.node;
       bridge->sat_port = baddress.socket;
     }
-#else
+#else /* MACOSX_SERVER */
     int len;
 
     if ((s = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0) 
@@ -75,7 +77,7 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
         close(s);
        return -1;
     }
-#endif
+#endif /* MACOSX_SERVER */
 
     return s;
 }